From c005bfc9c3788e1a1693927fb01f47e31c1a4b10 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Roland=20H=C3=A4der?= Date: Mon, 8 Aug 2016 15:22:38 +0200 Subject: [PATCH] Please rename: - this is no longer a contact's land-line/cellphone number controller, it only handles the number data itself - unlink/link with contact or employees or anything must be done in that specific controller MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Roland Häder Signed-off-by: Roland Häder --- .../beans/helper/PizzaWebRequestHelper.java | 4 ++-- ....java => PizzaAdminPhoneWebRequestBean.java} | 17 +++-------------- ...=> PizzaAdminPhoneWebRequestController.java} | 2 +- 3 files changed, 6 insertions(+), 17 deletions(-) rename src/java/org/mxchange/pizzaapplication/beans/phone/{PizzaAdminContactPhoneWebRequestBean.java => PizzaAdminPhoneWebRequestBean.java} (90%) rename src/java/org/mxchange/pizzaapplication/beans/phone/{PizzaAdminContactPhoneWebRequestController.java => PizzaAdminPhoneWebRequestController.java} (96%) diff --git a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java index 11090b11..57d50f17 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java +++ b/src/java/org/mxchange/pizzaapplication/beans/helper/PizzaWebRequestHelper.java @@ -29,7 +29,7 @@ import org.mxchange.jusercore.model.user.User; import org.mxchange.pizzaapplication.beans.contact.PizzaAdminContactWebRequestController; import org.mxchange.pizzaapplication.beans.customer.PizzaAdminCustomerWebRequestController; import org.mxchange.pizzaapplication.beans.customer.PizzaCustomerWebSessionController; -import org.mxchange.pizzaapplication.beans.phone.PizzaAdminContactPhoneWebRequestController; +import org.mxchange.pizzaapplication.beans.phone.PizzaAdminPhoneWebRequestController; import org.mxchange.pizzaapplication.beans.user.PizzaUserWebSessionController; /** @@ -62,7 +62,7 @@ public class PizzaWebRequestHelper implements PizzaWebRequestController { * Administrative phone controller */ @Inject - private PizzaAdminContactPhoneWebRequestController adminPhoneController; + private PizzaAdminPhoneWebRequestController adminPhoneController; /** * Contact instance diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java similarity index 90% rename from src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java rename to src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java index ef934fcd..41e7c25d 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestBean.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestBean.java @@ -39,7 +39,7 @@ import org.mxchange.pizzaapplication.beans.BasePizzaController; */ @Named ("adminPhoneController") @RequestScoped -public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController implements PizzaAdminContactPhoneWebRequestController { +public class PizzaAdminPhoneWebRequestBean extends BasePizzaController implements PizzaAdminPhoneWebRequestController { /** * Serial number @@ -86,14 +86,14 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im /** * Default constructor */ - public PizzaAdminContactPhoneWebRequestBean () { + public PizzaAdminPhoneWebRequestBean () { // Try it try { // Get initial context Context context = new InitialContext(); // Try to lookup the beans - this.adminRemoteBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/pizzaservice-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N + this.adminRemoteBean = (AdminContactsPhoneSessionBeanRemote) context.lookup("java:global/jlandingpage-ejb/admincontactphone!org.mxchange.jcontacts.phone.AdminContactsPhoneSessionBeanRemote"); //NOI18N } catch (final NamingException e) { // Throw it again throw new FaceletException(e); @@ -167,15 +167,4 @@ public class PizzaAdminContactPhoneWebRequestBean extends BasePizzaController im this.landLine = landLine; } - /** - * Clears this bean - */ - private void clear () { - // Clear all fields - this.setCellPhone(null); - this.setContact(null); - this.setFax(null); - this.setLandLine(null); - } - } diff --git a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestController.java b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java similarity index 96% rename from src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestController.java rename to src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java index e3266f6c..a2d95a96 100644 --- a/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminContactPhoneWebRequestController.java +++ b/src/java/org/mxchange/pizzaapplication/beans/phone/PizzaAdminPhoneWebRequestController.java @@ -29,7 +29,7 @@ import org.mxchange.jphone.phonenumbers.landline.DialableLandLineNumber; *

* @author Roland Haeder */ -public interface PizzaAdminContactPhoneWebRequestController extends Serializable { +public interface PizzaAdminPhoneWebRequestController extends Serializable { /** * Getter for all contacts having current cellphone instance linked -- 2.39.5