This is an automated email from the git hooks/post-receive script. New commit to branch feature/7547 in repository observe. See http://git.codelutin.com/observe.git commit e3335977ac7d3c2675b208b7fbe4322bc8d19e3c Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 2 11:29:19 2015 +0200 deplacement de l'instance du generateur de text dans le context de l'application + utiliser la local de la configuration(refs #7547) --- .../main/java/fr/ird/observe/ObserveServiceHelper.java | 13 +++++++++++++ .../fr/ird/observe/ObserveSwingApplicationContext.java | 18 ++++++++++++++++++ .../main/java/fr/ird/observe/ObserveTextGenerator.java | 16 +++++++--------- .../ird/observe/ui/actions/ShowStorageInfoAction.java | 4 +++- .../fr/ird/observe/ui/storage/StorageUIHandler.java | 4 +++- .../observe/ui/storage/tabs/StorageTabUIHandler.java | 8 ++++++-- 6 files changed, 50 insertions(+), 13 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java index e174736..01feb10 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveServiceHelper.java @@ -192,6 +192,19 @@ public class ObserveServiceHelper { } /** + * Pour obtenir le generateur de text. + * + * @return l'instance partagé du generateur de text + */ + public static ObserveTextGenerator getTextGenerator() { + checkInit(); + ObserveSwingApplicationContext context = get(); + ObserveTextGenerator textGenerator = context.getTextGenerator(); + return textGenerator; + } + + + /** * Creates a new local temp storage. * * @param config the configuration containing the tmp directory to use diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java index 756316c..a3bc34d 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveSwingApplicationContext.java @@ -115,6 +115,11 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { public static final JAXXContextEntryDef<DecoratorService> DECORATOR_SERVICE_ENTRY_DEF = JAXXUtil.newContextEntryDef(DecoratorService.class); + /** the jaxx context entry to store the decorator service */ + public static final JAXXContextEntryDef<ObserveTextGenerator> TEXT_GENERATOR_ENTRY_DEF = + JAXXUtil.newContextEntryDef(ObserveTextGenerator.class); + + /** the jaxx context entry to store the service main factory */ public static final JAXXContextEntryDef<ObserveServiceMainFactory> SERVICE_MAIN_FACTORY_ENTRY_DEF = JAXXUtil.newContextEntryDef(ObserveServiceMainFactory.class); @@ -210,6 +215,19 @@ public class ObserveSwingApplicationContext extends DefaultApplicationContext { return decoratorService; } + public final ObserveTextGenerator getTextGenerator() { + ObserveTextGenerator textGenerator = + TEXT_GENERATOR_ENTRY_DEF.getContextValue(this); + if (textGenerator == null) { + + ObserveSwingApplicationConfig config = getConfig(); + textGenerator = new ObserveTextGenerator(config); + TEXT_GENERATOR_ENTRY_DEF.setContextValue(this, textGenerator); + } + return textGenerator; + } + + public final ObserveDataSourceConfigurationMainFactory getObserveDataSourceConfigurationMainFactory() { ObserveDataSourceConfigurationMainFactory configurationMainFactory = DATA_SOURCE_CONFIGURATION_FACTORY_ENTRY_DEF.getContextValue(this); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java b/observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java index d06f59b..897bf28 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ObserveTextGenerator.java @@ -1,5 +1,6 @@ package fr.ird.observe; +import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; import fr.ird.observe.services.configuration.ObserveDataSourceConfiguration; import fr.ird.observe.ui.storage.StorageUIModel; @@ -8,7 +9,6 @@ import freemarker.template.Configuration; import freemarker.template.Template; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.nuiton.i18n.I18n; import org.nuiton.jaxx.application.ApplicationTechnicalException; import java.io.StringWriter; @@ -24,12 +24,6 @@ public class ObserveTextGenerator { private static final Log log = LogFactory.getLog(ObserveTextGenerator.class); - protected static final ObserveTextGenerator currentInstance = new ObserveTextGenerator(); - - public static ObserveTextGenerator get() { - return currentInstance; - } - protected static final String DATA_SOURCE_CONFIGURATION_TEMPLATE = "dataSourceConfiguration.ftl"; protected static final String CONNEXION_TEST_RESULT_TEMPLATE = "connexionTestResult.ftl"; @@ -43,7 +37,11 @@ public class ObserveTextGenerator { protected final Configuration freemarkerConfiguration; - private ObserveTextGenerator() { + protected final ObserveSwingApplicationConfig observeConfiguration; + + public ObserveTextGenerator(ObserveSwingApplicationConfig observeConfiguration) { + this.observeConfiguration = observeConfiguration; + freemarkerConfiguration = new Configuration(Configuration.DEFAULT_INCOMPATIBLE_IMPROVEMENTS); // needed to overwrite "Defaults to default system encoding." @@ -78,7 +76,7 @@ public class ObserveTextGenerator { } protected String generateHtml(String templateName, Object model) { - return generateHtml(I18n.getDefaultLocale(), templateName, model); + return generateHtml(observeConfiguration.getLocale(), templateName, model); } protected String generateHtml(Locale locale, String templateName, Object model) { diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java index e1cc041..6b1a5bc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/actions/ShowStorageInfoAction.java @@ -22,6 +22,7 @@ package fr.ird.observe.ui.actions; * #L% */ +import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.db.ObserveSwingDataSource; @@ -65,7 +66,8 @@ public class ShowStorageInfoAction extends AbstractAction { source = null; } - String text = ObserveTextGenerator.get().getDataSourceInfo(source); + ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + String text = textGenerator.getDataSourceInfo(source); JOptionPane.showMessageDialog( ui, new JLabel(text), diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 0cd4773..03530f4 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -26,6 +26,7 @@ import com.google.common.collect.ImmutableSet; import com.google.common.collect.Iterables; import fr.ird.observe.ObserveActionExecutor; import fr.ird.observe.ObserveRunner; +import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveSwingApplicationContext; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.business.db.DataSource; @@ -667,7 +668,8 @@ public class StorageUIHandler { log.debug("Build report from step " + step); } StorageUIModel model = ui.getModel(); - String report = ObserveTextGenerator.get().getDataSourceConnectionReport(model); + ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + String report = textGenerator.getDataSourceConnectionReport(model); return report; } diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java index 5b5b1f7..b644e28 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/StorageTabUIHandler.java @@ -21,6 +21,7 @@ */ package fr.ird.observe.ui.storage.tabs; +import fr.ird.observe.ObserveServiceHelper; import fr.ird.observe.ObserveTextGenerator; import fr.ird.observe.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.db.ObserveSwingDataSource; @@ -99,7 +100,9 @@ public class StorageTabUIHandler { @Override public void propertyChange(PropertyChangeEvent evt) { StorageUIModel model = (StorageUIModel) evt.getSource(); - String txt = ObserveTextGenerator.get().getLoadDataSourceResume(model); + + ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + String txt = textGenerator.getLoadDataSourceResume(model); ui.getResume().setText(txt); } }; @@ -323,7 +326,8 @@ public class StorageTabUIHandler { } public String updateConnexionStatutText(ConfigUI ui, ConnexionStatus status) { - String text = ObserveTextGenerator.get().getConnexionTestResultMessage(ui.getModel()); + ObserveTextGenerator textGenerator = ObserveServiceHelper.getTextGenerator(); + String text = textGenerator.getConnexionTestResultMessage(ui.getModel()); return text; } public void chooseDumpFile(ConfigUI ui) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.