X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2Fjava%2Forg%2Fmxchange%2Faddressbook%2Fbeans%2Fmobileprovider%2FAddressbookAdminMobileProviderWebRequestBean.java;h=01fc8bd5edef4c1e6e300d98233f75d3c7211d56;hb=c6862a7f74dc3b2491404f6a3c42c3c5d6d68cb2;hp=e3a3078570faa37108a7651c068eaa15085a8a1d;hpb=97664a99d45bc0ef0e3378ca8ac31e801475e355;p=addressbook-war.git

diff --git a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java
index e3a30785..01fc8bd5 100644
--- a/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java
+++ b/src/java/org/mxchange/addressbook/beans/mobileprovider/AddressbookAdminMobileProviderWebRequestBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016 Roland Haeder
+ * Copyright (C) 2016 Roland Häder
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -28,22 +28,23 @@ import javax.inject.Named;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import org.mxchange.addressbook.beans.BaseAddressbookController;
 import org.mxchange.jcountry.data.Country;
 import org.mxchange.jphone.events.AdminAddedMobileProviderEvent;
 import org.mxchange.jphone.events.AdminMobileProviderAddedEvent;
 import org.mxchange.jphone.exceptions.MobileProviderAlreadyAddedException;
-import org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSingletonBeanRemote;
+import org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote;
 import org.mxchange.jphone.phonenumbers.mobileprovider.CellphoneProvider;
 import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
 
 /**
  * Administrative bean (controller) for mobile provider
  * <p>
- * @author Roland Haeder<roland@mxchange.org>
+ * @author Roland Häder<roland@mxchange.org>
  */
 @Named ("adminMobileProviderController")
 @RequestScoped
-public class AddressbookAdminMobileProviderWebRequestBean implements AddressbookAdminMobileProviderWebRequestController {
+public class AddressbookAdminMobileProviderWebRequestBean extends BaseAddressbookController implements AddressbookAdminMobileProviderWebRequestController {
 
 	/**
 	 * Serial number
@@ -53,7 +54,7 @@ public class AddressbookAdminMobileProviderWebRequestBean implements Addressbook
 	/**
 	 * Remote EJB for mobile providers (administrative)
 	 */
-	private AdminMobileProviderSingletonBeanRemote adminRemoteBean;
+	private AdminMobileProviderSessionBeanRemote adminRemoteBean;
 
 	/**
 	 * Regular bean
@@ -98,7 +99,7 @@ public class AddressbookAdminMobileProviderWebRequestBean implements Addressbook
 			Context context = new InitialContext();
 
 			// Try to lookup the beans
-			this.adminRemoteBean = (AdminMobileProviderSingletonBeanRemote) context.lookup("java:global/addressbook-ejb/adminmobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSingletonBeanRemote"); //NOI18N
+			this.adminRemoteBean = (AdminMobileProviderSessionBeanRemote) context.lookup("java:global/addressbook-ejb/adminmobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.AdminMobileProviderSessionBeanRemote"); //NOI18N
 		} catch (final NamingException e) {
 			// Throw it again
 			throw new FaceletException(e);
@@ -106,14 +107,15 @@ public class AddressbookAdminMobileProviderWebRequestBean implements Addressbook
 	}
 
 	@Override
-	public void addMobileProvider () {
+	public String addMobileProvider () {
 		// Create mobile provider instance
 		MobileProvider mobileProvider = new CellphoneProvider(this.getProviderDialPrefix(), this.getProviderName(), this.getProviderCountry(), this.getProviderMailPattern());
 
 		// Is the provider already created?
 		if (this.isMobileProviderCreated(mobileProvider)) {
 			// Then throw exception
-			throw new FaceletException(new MobileProviderAlreadyAddedException(mobileProvider));
+			this.showFacesMessage("form_add_mobile_provider:providerDialPrefix", new MobileProviderAlreadyAddedException(mobileProvider)); //NOI18N
+			return ""; //NOI18N
 		}
 
 		// Init variable
@@ -130,13 +132,8 @@ public class AddressbookAdminMobileProviderWebRequestBean implements Addressbook
 		// Fire event
 		this.providerAddedEvent.fire(new AdminMobileProviderAddedEvent(updatedProvider));
 
-		// Clear this bean
-		this.clear();
-	}
-
-	@Override
-	public List<MobileProvider> allMobileProvider () {
-		return this.mobileController.allMobileProvider();
+		// Redirect to list
+		return "admin_list_mobile_provider"; //NOI18N
 	}
 
 	@Override
@@ -179,22 +176,6 @@ public class AddressbookAdminMobileProviderWebRequestBean implements Addressbook
 		this.providerName = providerName;
 	}
 
-	@Override
-	public boolean hasMobileProvider () {
-		return (!this.allMobileProvider().isEmpty());
-	}
-
-	/**
-	 * Clears this bean
-	 */
-	private void clear () {
-		// Clear all fields
-		this.setProviderCountry(null);
-		this.setProviderDialPrefix(null);
-		this.setProviderMailPattern(null);
-		this.setProviderName(null);
-	}
-
 	/**
 	 * Checks whether if the given mobile provider is already created by
 	 * checking both dial prefix and country.
@@ -208,7 +189,7 @@ public class AddressbookAdminMobileProviderWebRequestBean implements Addressbook
 		boolean isFound = false;
 
 		// Get list of all providers
-		List<MobileProvider> providers = this.allMobileProvider();
+		List<MobileProvider> providers = this.mobileController.allMobileProvider();
 
 		// Get iterator from it
 		Iterator<MobileProvider> iterator = providers.iterator();