From eccea36f65a917177858636b45ac6543616b6c05 Mon Sep 17 00:00:00 2001 From: Roland Haeder Date: Mon, 19 Oct 2015 09:34:28 +0200 Subject: [PATCH] =?utf8?q?Renamed=20beans=20to=20their=20proper=20scope=20?= =?utf8?q?+=20renamed=20bean=20mappedName=20to=20always=20end=20with=20"Co?= =?utf8?q?ntroller"=20Signed-off-by:Roland=20H=C3=A4der=20?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .../model/category/CategoryConverter.java | 4 +- .../beans/AbstractWebBean.java | 74 ------------------- ...WebBean.java => BasketWebSessionBean.java} | 4 +- ...r.java => BasketWebSessionController.java} | 2 +- ....java => AdminCategoryWebRequestBean.java} | 8 +- ...=> AdminCategoryWebRequestController.java} | 2 +- ...bBean.java => CheckoutWebSessionBean.java} | 14 ++-- ...java => CheckoutWebSessionController.java} | 2 +- ...an.java => CountryWebApplicationBean.java} | 4 +- ...a => CountryWebApplicationController.java} | 2 +- ...bBean.java => CustomerWebSessionBean.java} | 4 +- ...java => CustomerWebSessionController.java} | 2 +- ...ean.java => GenderWebApplicationBean.java} | 4 +- ...va => GenderWebApplicationController.java} | 2 +- ...n.java => AdminProductWebRequestBean.java} | 10 +-- ... => AdminProductWebRequestController.java} | 2 +- ...ebBean.java => ReceiptWebSessionBean.java} | 4 +- ....java => ReceiptWebSessionController.java} | 2 +- ...bBean.java => ShopWebApplicationBean.java} | 3 +- ...java => ShopWebApplicationController.java} | 2 +- .../admin/admin_category_selection_box.tpl | 2 +- web/admin/product.xhtml | 10 +-- 22 files changed, 44 insertions(+), 119 deletions(-) delete mode 100644 src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java rename src/java/org/mxchange/pizzaapplication/beans/basket/{BasketWebBean.java => BasketWebSessionBean.java} (99%) rename src/java/org/mxchange/pizzaapplication/beans/basket/{BasketWebController.java => BasketWebSessionController.java} (98%) rename src/java/org/mxchange/pizzaapplication/beans/category/{AdminCategoryWebBean.java => AdminCategoryWebRequestBean.java} (92%) rename src/java/org/mxchange/pizzaapplication/beans/category/{AdminCategoryWebController.java => AdminCategoryWebRequestController.java} (96%) rename src/java/org/mxchange/pizzaapplication/beans/checkout/{CheckoutWebBean.java => CheckoutWebSessionBean.java} (92%) rename src/java/org/mxchange/pizzaapplication/beans/checkout/{CheckoutWebController.java => CheckoutWebSessionController.java} (95%) rename src/java/org/mxchange/pizzaapplication/beans/country/{CountryWebBean.java => CountryWebApplicationBean.java} (94%) rename src/java/org/mxchange/pizzaapplication/beans/country/{CountryWebController.java => CountryWebApplicationController.java} (93%) rename src/java/org/mxchange/pizzaapplication/beans/customer/{CustomerWebBean.java => CustomerWebSessionBean.java} (98%) rename src/java/org/mxchange/pizzaapplication/beans/customer/{CustomerWebController.java => CustomerWebSessionController.java} (98%) rename src/java/org/mxchange/pizzaapplication/beans/gender/{GenderWebBean.java => GenderWebApplicationBean.java} (92%) rename src/java/org/mxchange/pizzaapplication/beans/gender/{GenderWebController.java => GenderWebApplicationController.java} (94%) rename src/java/org/mxchange/pizzaapplication/beans/product/{AdminProductWebBean.java => AdminProductWebRequestBean.java} (93%) rename src/java/org/mxchange/pizzaapplication/beans/product/{AdminProductWebController.java => AdminProductWebRequestController.java} (98%) rename src/java/org/mxchange/pizzaapplication/beans/receipt/{ReceiptWebBean.java => ReceiptWebSessionBean.java} (94%) rename src/java/org/mxchange/pizzaapplication/beans/receipt/{ReceiptWebController.java => ReceiptWebSessionController.java} (95%) rename src/java/org/mxchange/pizzaapplication/beans/shop/{ShopWebBean.java => ShopWebApplicationBean.java} (96%) rename src/java/org/mxchange/pizzaapplication/beans/shop/{ShopWebController.java => ShopWebApplicationController.java} (96%) diff --git a/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java b/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java index b811c9b5..8ada3709 100644 --- a/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java +++ b/src/java/org/mxchange/jshopcore/model/category/CategoryConverter.java @@ -30,7 +30,7 @@ import javax.naming.InitialContext; import javax.naming.NamingException; import org.mxchange.jcoreeelogger.beans.local.logger.Log; import org.mxchange.jcoreeelogger.beans.local.logger.LoggerBeanLocal; -import org.mxchange.pizzaapplication.beans.shop.ShopWebController; +import org.mxchange.pizzaapplication.beans.shop.ShopWebApplicationController; /** * A converter for transfering category objects @@ -50,7 +50,7 @@ public class CategoryConverter implements Converter { * Category bean */ @Inject - private ShopWebController shopController; + private ShopWebApplicationController shopController; @Override public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) { diff --git a/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java deleted file mode 100644 index 1e632c58..00000000 --- a/src/java/org/mxchange/pizzaapplication/beans/AbstractWebBean.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * Copyright (C) 2015 Roland Haeder - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see . - */ -package org.mxchange.pizzaapplication.beans; - -import java.io.Serializable; -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 { - - /** - * Serial number - */ - private static final long serialVersionUID = 48_475_834_783_473_187L; - - /** - * Bundle instance - */ - private final ResourceBundle bundle; - - /** - * Protectd constructor - */ - protected AbstractWebBean () { - // Load resource bundle - this.bundle = ResourceBundle.getBundle("org/mxchange/localization/bundle"); - } - - /** - * Getter for bundle instance - *

- * @return Bundle instance - */ - protected ResourceBundle getBundle () { - return this.bundle; - } - - /** - * Getter for message from given key - *

- * @param key Key to get message from - *

- * @return Message - */ - protected String getMessageStringFromKey (final String key) { - // Is the bundle loaded? - if (this.getBundle() == null) { - // Abort here - throw new NullPointerException("bundle is null"); //NOI18N - } - - // Return message - return this.getBundle().getString(key); - } -} diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebSessionBean.java similarity index 99% rename from src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebSessionBean.java index edf197f1..5b10a767 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebSessionBean.java @@ -40,7 +40,7 @@ import org.mxchange.jshopcore.model.product.Product; */ @Named ("basketController") @SessionScoped -public class BasketWebBean implements BasketWebController { +public class BasketWebSessionBean implements BasketWebSessionController { /** * Serial number @@ -72,7 +72,7 @@ public class BasketWebBean implements BasketWebController { /** * Default constructor */ - public BasketWebBean () { + public BasketWebSessionBean () { // Get new application instance this.basket = new ShopBasket(); diff --git a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebSessionController.java similarity index 98% rename from src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebSessionController.java index 04b3cd6b..a2fd6fe8 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/basket/BasketWebSessionController.java @@ -26,7 +26,7 @@ import org.mxchange.jshopcore.model.product.Product; *

* @author Roland Haeder */ -public interface BasketWebController extends Serializable { +public interface BasketWebSessionController extends Serializable { /** * Adds given product instance to basket by adding amount from form data to diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebRequestBean.java similarity index 92% rename from src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebRequestBean.java index 33ceaca5..6e18de4a 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebRequestBean.java @@ -28,7 +28,7 @@ import org.mxchange.jshopcore.exceptions.CategoryTitleAlreadyUsedException; import org.mxchange.jshopcore.model.category.AdminCategorySessionBeanRemote; import org.mxchange.jshopcore.model.category.Category; import org.mxchange.jshopcore.model.category.ProductCategory; -import org.mxchange.pizzaapplication.beans.shop.ShopWebController; +import org.mxchange.pizzaapplication.beans.shop.ShopWebApplicationController; /** * Main application class @@ -37,7 +37,7 @@ import org.mxchange.pizzaapplication.beans.shop.ShopWebController; */ @Named ("admin_category") @RequestScoped -public class AdminCategoryWebBean implements AdminCategoryWebController { +public class AdminCategoryWebRequestBean implements AdminCategoryWebRequestController { /** * Serial number @@ -66,12 +66,12 @@ public class AdminCategoryWebBean implements AdminCategoryWebController { * Shop bean */ @Inject - private ShopWebController shopController; + private ShopWebApplicationController shopController; /** * Default constructor */ - public AdminCategoryWebBean () { + public AdminCategoryWebRequestBean () { // Try it try { // Get initial context diff --git a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebRequestController.java similarity index 96% rename from src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebRequestController.java index 4cef66d8..8cdc11a5 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/category/AdminCategoryWebRequestController.java @@ -24,7 +24,7 @@ import org.mxchange.jshopcore.model.category.Category; *

* @author Roland Haeder */ -public interface AdminCategoryWebController { +public interface AdminCategoryWebRequestController { /** * Adds given category data from request to database diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebSessionBean.java similarity index 92% rename from src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebSessionBean.java index 95b1bf6a..65fb3052 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebSessionBean.java @@ -37,9 +37,9 @@ import org.mxchange.jshopcore.model.basket.AddableBasketItem; import org.mxchange.jshopcore.model.customer.Customer; import org.mxchange.jshopcore.wrapper.CheckoutWrapper; import org.mxchange.jshopcore.wrapper.WrapableCheckout; -import org.mxchange.pizzaapplication.beans.basket.BasketWebController; -import org.mxchange.pizzaapplication.beans.customer.CustomerWebController; -import org.mxchange.pizzaapplication.beans.receipt.ReceiptWebController; +import org.mxchange.pizzaapplication.beans.basket.BasketWebSessionController; +import org.mxchange.pizzaapplication.beans.customer.CustomerWebSessionController; +import org.mxchange.pizzaapplication.beans.receipt.ReceiptWebSessionController; /** * Checkout controller @@ -48,7 +48,7 @@ import org.mxchange.pizzaapplication.beans.receipt.ReceiptWebController; */ @Named ("checkoutController") @SessionScoped -public class CheckoutWebBean implements CheckoutWebController { +public class CheckoutWebSessionBean implements CheckoutWebSessionController { /** * Serial number @@ -60,7 +60,7 @@ public class CheckoutWebBean implements CheckoutWebController { * Basket bean */ @Inject - private BasketWebController basketController; + private BasketWebSessionController basketController; /** * Connection @@ -76,7 +76,7 @@ public class CheckoutWebBean implements CheckoutWebController { * Customer bean */ @Inject - private CustomerWebController customerController; + private CustomerWebSessionController customerController; /** * Object message @@ -97,7 +97,7 @@ public class CheckoutWebBean implements CheckoutWebController { * Receipt bean */ @Inject - private ReceiptWebController receiptController; + private ReceiptWebSessionController receiptController; /** * Session instance diff --git a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebSessionController.java similarity index 95% rename from src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebSessionController.java index 513ed541..68abb899 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/checkout/CheckoutWebSessionController.java @@ -24,7 +24,7 @@ import org.mxchange.jshopcore.model.customer.Customer; *

* @author Roland Haeder */ -public interface CheckoutWebController extends Serializable { +public interface CheckoutWebSessionController extends Serializable { /** * Runs the actual checkout and returns a proper page redirection target. diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebApplicationBean.java similarity index 94% rename from src/java/org/mxchange/pizzaapplication/beans/country/CountryWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/country/CountryWebApplicationBean.java index e55683b3..186de997 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebApplicationBean.java @@ -35,7 +35,7 @@ import org.mxchange.jcountry.data.CountrySingletonBeanRemote; */ @Named ("country") @ApplicationScoped -public class CountryWebBean implements CountryWebController { +public class CountryWebApplicationBean implements CountryWebApplicationController { /** * Serial number @@ -55,7 +55,7 @@ public class CountryWebBean implements CountryWebController { /** * Default constructor */ - public CountryWebBean () { + public CountryWebApplicationBean () { // Try this try { // Get initial context diff --git a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebController.java b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebApplicationController.java similarity index 93% rename from src/java/org/mxchange/pizzaapplication/beans/country/CountryWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/country/CountryWebApplicationController.java index b9fac8c8..a26fc290 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/country/CountryWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcountry.data.Country; *

* @author Roland Haeder */ -public interface CountryWebController extends Serializable { +public interface CountryWebApplicationController extends Serializable { /** * A list of all countries diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebSessionBean.java similarity index 98% rename from src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebSessionBean.java index 7e0710b9..f8a9a81b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebSessionBean.java @@ -40,7 +40,7 @@ import org.mxchange.jshopcore.model.customer.ShopCustomer; */ @Named ("customerController") @SessionScoped -public class CustomerWebBean implements CustomerWebController { +public class CustomerWebSessionBean implements CustomerWebSessionController { /** * Serial number @@ -121,7 +121,7 @@ public class CustomerWebBean implements CustomerWebController { /** * Default constructor */ - public CustomerWebBean () { + public CustomerWebSessionBean () { // Set gender to UNKNOWN this.gender = Gender.UNKNOWN; diff --git a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebSessionController.java similarity index 98% rename from src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebSessionController.java index 13d3fa72..9eac772f 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/customer/CustomerWebSessionController.java @@ -29,7 +29,7 @@ import org.mxchange.jshopcore.model.customer.Customer; *

* @author Roland Haeder */ -public interface CustomerWebController extends Serializable { +public interface CustomerWebSessionController extends Serializable { /** * Creates an instance from all properties diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebApplicationBean.java similarity index 92% rename from src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebApplicationBean.java index 72029bf1..473b1413 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebApplicationBean.java @@ -29,7 +29,7 @@ import org.mxchange.jcontacts.contact.gender.GenderUtils; */ @Named ("gender") @ApplicationScoped -public class GenderWebBean implements GenderWebController { +public class GenderWebApplicationBean implements GenderWebApplicationController { /** * Serial number @@ -39,7 +39,7 @@ public class GenderWebBean implements GenderWebController { /** * Default constructor */ - public GenderWebBean () { + public GenderWebApplicationBean () { } @Override diff --git a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebApplicationController.java similarity index 94% rename from src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebApplicationController.java index 5618aa6b..d547f95b 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/gender/GenderWebApplicationController.java @@ -25,7 +25,7 @@ import org.mxchange.jcontacts.contact.gender.Gender; *

* @author Roland Haeder */ -public interface GenderWebController extends Serializable { +public interface GenderWebApplicationController extends Serializable { /** * Getter for all genders as array diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebRequestBean.java similarity index 93% rename from src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebRequestBean.java index 8c7c9b02..2e3f50f0 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebRequestBean.java @@ -30,16 +30,16 @@ import org.mxchange.jshopcore.model.category.Category; import org.mxchange.jshopcore.model.product.AdminProductSessionBeanRemote; import org.mxchange.jshopcore.model.product.GenericProduct; import org.mxchange.jshopcore.model.product.Product; -import org.mxchange.pizzaapplication.beans.shop.ShopWebController; +import org.mxchange.pizzaapplication.beans.shop.ShopWebApplicationController; /** * Main application class *

* @author Roland Haeder */ -@Named ("admin_product") +@Named ("adminProductController") @RequestScoped -public class AdminProductWebBean implements AdminProductWebController { +public class AdminProductWebRequestBean implements AdminProductWebRequestController { /** * Serial number @@ -78,12 +78,12 @@ public class AdminProductWebBean implements AdminProductWebController { * Shop bean */ @Inject - private ShopWebController shopController; + private ShopWebApplicationController shopController; /** * Default constructor */ - public AdminProductWebBean () { + public AdminProductWebRequestBean () { // Try it try { // Get initial context diff --git a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebRequestController.java similarity index 98% rename from src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebRequestController.java index ac384d77..95450068 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/product/AdminProductWebRequestController.java @@ -26,7 +26,7 @@ import org.mxchange.jshopcore.model.product.Product; *

* @author Roland Haeder */ -public interface AdminProductWebController { +public interface AdminProductWebRequestController { /** * Adds given product data from request to database diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebSessionBean.java similarity index 94% rename from src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebSessionBean.java index 7874c927..6d469334 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebSessionBean.java @@ -32,7 +32,7 @@ import org.mxchange.jshopcore.model.receipt.ReceiptBeanRemote; */ @Named ("receiptController") @SessionScoped -public class ReceiptWebBean implements ReceiptWebController { +public class ReceiptWebSessionBean implements ReceiptWebSessionController { /** * Serial number @@ -52,7 +52,7 @@ public class ReceiptWebBean implements ReceiptWebController { /** * Default constructor */ - public ReceiptWebBean () { + public ReceiptWebSessionBean () { try { // Get initial context Context context = new InitialContext(); diff --git a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebSessionController.java similarity index 95% rename from src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebSessionController.java index 85e85e98..fa0f3fd1 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/receipt/ReceiptWebSessionController.java @@ -24,7 +24,7 @@ import org.mxchange.jshopcore.model.customer.Customer; *

* @author Roland Haeder */ -public interface ReceiptWebController extends Serializable { +public interface ReceiptWebSessionController extends Serializable { /** * Fetches last access key for given customer instance diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebApplicationBean.java similarity index 96% rename from src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java rename to src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebApplicationBean.java index d661a292..daf67bb3 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebApplicationBean.java @@ -31,7 +31,6 @@ import org.mxchange.jshopcore.model.category.Category; import org.mxchange.jshopcore.model.category.CategorySessionBeanRemote; import org.mxchange.jshopcore.model.product.Product; import org.mxchange.jshopcore.model.product.ProductSessionBeanRemote; -import org.mxchange.pizzaapplication.beans.AbstractWebBean; /** * General shop controller @@ -40,7 +39,7 @@ import org.mxchange.pizzaapplication.beans.AbstractWebBean; */ @Named ("controller") @ApplicationScoped -public class ShopWebBean extends AbstractWebBean implements ShopWebController { +public class ShopWebApplicationBean implements ShopWebApplicationController { /** * Serial number diff --git a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebApplicationController.java similarity index 96% rename from src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java rename to src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebApplicationController.java index 24a51d58..6968a175 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/shop/ShopWebApplicationController.java @@ -27,7 +27,7 @@ import org.mxchange.jshopcore.model.product.Product; *

* @author Roland Haeder */ -public interface ShopWebController extends Serializable { +public interface ShopWebApplicationController extends Serializable { /** * Adds given category to the "cached" instance diff --git a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl index 62a2019a..8149afdb 100644 --- a/web/WEB-INF/templates/admin/admin_category_selection_box.tpl +++ b/web/WEB-INF/templates/admin/admin_category_selection_box.tpl @@ -4,7 +4,7 @@ xmlns:h="http://java.sun.com/jsf/html" xmlns:ui="http://java.sun.com/jsf/facelets"> - + diff --git a/web/admin/product.xhtml b/web/admin/product.xhtml index 97cf68c8..ea8fc2a1 100644 --- a/web/admin/product.xhtml +++ b/web/admin/product.xhtml @@ -16,7 +16,7 @@

- + Produktnummer: #{product.productId}: @@ -45,8 +45,8 @@
- - + +
@@ -105,7 +105,7 @@
- + @@ -117,7 +117,7 @@
- +
-- 2.39.5