Don't cherry-pick:

[pizzaservice-war.git] / src / java / org / mxchange / pizzaapplication / converter / mobileprovider / PizzaMobileProviderConverter.java

diff --git a/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java b/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java
index 6661f39b83e5f0216811c0315f3bb7e4dc6b98db..4c1d78bf6cb61233a1895cd8946bd38952a756b4 100644 (file)
--- a/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java
+++ b/src/java/org/mxchange/pizzaapplication/converter/mobileprovider/PizzaMobileProviderConverter.java
@@ -27,8 +27,8 @@ import javax.faces.convert.FacesConverter;
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
-import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProvider;
-import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
+import org.mxchange.jphone.model.phonenumbers.model.mobileprovider.MobileProvider;
+import org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote;
 
 /**
  * Converter for SMS provider instance
@@ -36,7 +36,7 @@ import org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBe
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter (value = "MobileProviderConverter")
-public class PizzaMobileProviderConverter implements Converter {
+public class PizzaMobileProviderConverter implements Converter<MobileProvider> {
 
        /**
         * Mobile provider bean
@@ -44,13 +44,13 @@ public class PizzaMobileProviderConverter implements Converter {
        private static MobileProviderSingletonBeanRemote MOBILE_PROVIDER_BEAN;
 
        /**
-        * Initialization of this converter
+        * Default constructor
         */
        public PizzaMobileProviderConverter () {
        }
 
        @Override
-       public Object getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
+       public MobileProvider getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
                        // Warning message
@@ -69,7 +69,7 @@ public class PizzaMobileProviderConverter implements Converter {
                                Context initialContext = new InitialContext();
 
                                /// and mobile provider controller
-                               PizzaMobileProviderConverter.MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initialContext.lookup("java:global/pizzaapplication-ejb/mobileprovider!org.mxchange.jphone.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N
+                               PizzaMobileProviderConverter.MOBILE_PROVIDER_BEAN = (MobileProviderSingletonBeanRemote) initialContext.lookup("java:global/pizzaapplication-ejb/mobileprovider!org.mxchange.jphone.model.phonenumbers.mobileprovider.MobileProviderSingletonBeanRemote"); //NOI18N
                        } catch (final NamingException ex) {
                                // Continue to throw it
                                throw new ConverterException(MessageFormat.format("initialContext.lookup() failed: {0}", ex.getMessage()), ex); //NOI18N
@@ -109,18 +109,15 @@ public class PizzaMobileProviderConverter implements Converter {
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final Object value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final MobileProvider value) {
                // Is the object null?
-               if ((null == value) || ((String.valueOf(value)).isEmpty())) {
+               if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null
                        return ""; //NOI18N
-               } else if (!(value instanceof MobileProvider)) {
-                       // Not same interface
-                       throw new IllegalArgumentException(MessageFormat.format("value {0} does not implement MobileProvider.", value)); //NOI18N
                }
 
-               // Return category id
-               return String.valueOf(((MobileProvider) value).getProviderId());
+               // Return id number
+               return String.valueOf(value.getProviderId());
        }
 
 }