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 83e5e5045e1164de6b0610b9fde7da8d78381138..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
@@ -24,8 +24,8 @@ import javax.faces.convert.ConverterException;
 import javax.faces.convert.FacesConverter;
 import org.mxchange.jcontactsbusiness.exceptions.basicdata.BasicDataNotFoundException;
 import org.mxchange.jcontactsbusiness.model.basicdata.BasicData;
-import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestBean;
-import org.mxchange.jfinancials.beans.business.basicdata.FinancialsBusinessDataWebRequestController;
+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
@@ -38,21 +38,12 @@ public class FinancialsBasicCompanyDataConverter implements Converter<BasicData>
        /**
         * Basic company data backing bean
         */
-       private static FinancialsBusinessDataWebRequestController BASIC_DATA_CONTROLLER;
+       private static FinancialsBasicDataListWebViewController BASIC_DATA_LIST_CONTROLLER;
 
        @Override
        public BasicData getAsObject (final FacesContext context, final UIComponent component, final String submittedValue) {
-               // Is the instance there?
-               if (BASIC_DATA_CONTROLLER == null) {
-                       // Get bean from CDI directly
-                       BASIC_DATA_CONTROLLER = CDI.current().select(FinancialsBusinessDataWebRequestBean.class).get();
-               }
-
                // 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;
                }
@@ -60,12 +51,18 @@ public class FinancialsBasicCompanyDataConverter implements Converter<BasicData>
                // Init instance
                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_CONTROLLER.findBasicDataById(basicDataId);
+                       basicData = BASIC_DATA_LIST_CONTROLLER.findBasicDataById(basicDataId);
                } catch (final NumberFormatException ex) {
                        // Throw again
                        throw new ConverterException(ex);