This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 893c1d09792dc64fa4c00f1de5bb0f242800f560 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 27 14:49:23 2016 +0100 [iso] suppression code mort --- .../application/swing/ObserveTextGenerator.java | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java index c839f76..e7dde51 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveTextGenerator.java @@ -24,14 +24,11 @@ package fr.ird.observe.application.swing; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; -import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; -import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import fr.ird.observe.application.swing.ui.storage.StorageUIModel; +import fr.ird.observe.services.configuration.ObserveDataSourceInformation; import freemarker.cache.ClassTemplateLoader; import freemarker.template.Configuration; import freemarker.template.Template; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.StringWriter; @@ -45,10 +42,6 @@ import static org.nuiton.i18n.I18n.t; */ public class ObserveTextGenerator { - private static final Log log = LogFactory.getLog(ObserveTextGenerator.class); - - protected static final String DATA_SOURCE_CONFIGURATION_TEMPLATE = "dataSourceConfiguration.ftl"; - protected static final String CONNEXION_TEST_RESULT_TEMPLATE = "connexionTestResult.ftl"; protected static final String DATA_SOURCE_SELECT_MODE_RESUME_TEMPLATE = "dataSourceSelectModeResume.ftl"; @@ -76,12 +69,6 @@ public class ObserveTextGenerator { // specific template loader to get template from jars (classpath) ClassTemplateLoader templateLoader = new ClassTemplateLoader(ObserveTextGenerator.class, "/ftl"); freemarkerConfiguration.setTemplateLoader(templateLoader); - -// freemarkerConfiguration.setObjectWrapper(new BeansWrapper(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS)); - } - - public String getConfigurationDetail(ObserveDataSourceConfiguration dataSourceConfiguration) { - return generateHtml(DATA_SOURCE_CONFIGURATION_TEMPLATE, dataSourceConfiguration); } public String getConnexionTestResultMessage(StorageUIModel model) { @@ -124,9 +111,6 @@ public class ObserveTextGenerator { } catch (Exception ex) { - if (log.isErrorEnabled()) { - log.error("error while generating html", ex); - } throw new ApplicationTechnicalException(t("observe.generateHtml.error", templateName), ex); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.