Updated copyright year

[jfinancials-war.git] / src / java / org / mxchange / jfinancials / converter / business / basicdata / FinancialsBasicCompanyDataConverter.java

diff --git a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java
index 7c8d130ef2c68a3193e09d1ff6283ce3a0c12974..df239b7116e9831951bd5aadb139aa3c079629f8 100644 (file)
--- a/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java
+++ b/src/java/org/mxchange/jfinancials/converter/business/basicdata/FinancialsBasicCompanyDataConverter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2016, 2017 Roland Häder
+ * Copyright (C) 2016 - 2022 Free Software Foundation
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as
@@ -16,19 +16,16 @@
  */
 package org.mxchange.jfinancials.converter.business.basicdata;
 
-import javax.faces.application.FacesMessage;
+import javax.enterprise.inject.spi.CDI;
 import javax.faces.component.UIComponent;
 import javax.faces.context.FacesContext;
 import javax.faces.convert.Converter;
 import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
-import javax.faces.validator.ValidatorException;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicCompanyDataNotFoundException;
-import org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote;
-import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
+import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataNotFoundException;
+import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
+import org.mxchange.jfinancials.beans.business.basicdata.list.FinancialsBasicDataListWebViewBean;
+import org.mxchange.jfinancials.beans.business.basicdata.list.FinancialsBasicDataListWebViewController;
 
 /**
  * Converter for basic company data id <-> valid basic company data instance
@@ -36,51 +33,40 @@ import org.mxchange.jcontactsbusiness.model.basicdata.BusinessBasicData;
  * @author Roland Häder<roland@mxchange.org>
  */
 @FacesConverter ("BasicCompanyDataConverter")
-public class FinancialsBasicCompanyDataConverter implements Converter<BusinessBasicData> {
+public class FinancialsBasicCompanyDataConverter implements Converter<BasicData> {
 
        /**
-        * Basic company data EJB
+        * Basic company data backing bean
         */
-       private static BasicCompanyDataSessionBeanRemote BASIC_DATA_BEAN;
+       private static FinancialsBasicDataListWebViewController BASIC_DATA_LIST_CONTROLLER;
 
        @Override
-       public BusinessBasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Is the instance there?
-               if (BASIC_DATA_BEAN == null) {
-                       try {
-                               // Not yet, attempt lookup
-                               final Context initial = new InitialContext();
-
-                               // Lookup EJB
-                               BASIC_DATA_BEAN = (BasicCompanyDataSessionBeanRemote) initial.lookup("java:global/jfinancials-ejb/basicCompanyData!org.mxchange.jcontactsbusiness.model.basicdata.BasicCompanyDataSessionBeanRemote"); //NOI18N
-                       } catch (final NamingException ex) {
-                               // Throw it again
-                               throw new ValidatorException(new FacesMessage(FacesMessage.SEVERITY_ERROR, "Cannot lookup EJB", ex.getMessage()), ex); //NOI18N
-                       }
-               }
-
+       public BasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
                // Is the value null or empty?
                if ((null == submittedValue) || (submittedValue.trim().isEmpty())) {
-                       // Warning message
-                       // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logWarning(MessageFormat.format("{0}.getAsObject(): submittedValue is null or empty - EXIT!", this.getClass().getSimpleName())); //NOI18N
-
                        // Return null
                        return null;
                }
 
                // Init instance
-               BusinessBasicData basicData = null;
+               BasicData basicData = null;
+
+               // Is the instance there?
+               if (null == BASIC_DATA_LIST_CONTROLLER) {
+                       // Get bean from CDI directly
+                       BASIC_DATA_LIST_CONTROLLER = CDI.current().select(FinancialsBasicDataListWebViewBean.class).get();
+               }
 
                try {
                        // Try to parse the value as long
                        final Long basicDataId = Long.valueOf(submittedValue);
 
                        // Try to get user instance from it
-                       basicData = BASIC_DATA_BEAN.findBasicDataById(basicDataId);
+                       basicData = BASIC_DATA_LIST_CONTROLLER.findBasicDataById(basicDataId);
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);
-               } catch (final BasicCompanyDataNotFoundException ex) {
+               } catch (final BasicDataNotFoundException ex) {
                        // Debug message
                        // @TODO Not working with JNDI (no remote interface) this.loggerBeanLocal.logDebug(MessageFormat.format("{0}.getAsObject(): Exception: {1} - Returning null ...", this.getClass().getSimpleName(), ex)); //NOI18N
                }
@@ -90,7 +76,7 @@ public class FinancialsBasicCompanyDataConverter implements Converter<BusinessBa
        }
 
        @Override
-       public String getAsString (final FacesContext context, final UIComponent component, final BusinessBasicData value) {
+       public String getAsString (final FacesContext context, final UIComponent component, final BasicData value) {
                // Is the object null?
                if ((null == value) || (String.valueOf(value).isEmpty())) {
                        // Is null