This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 02fb1cb22d193447a394a18869654b205e58d9b1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 13 08:51:24 2014 +0200 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs --- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 96 ---------------------- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 2 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 2 +- 4 files changed, 3 insertions(+), 98 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 6562e04..15446ff 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -635,100 +635,4 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.FULL_BLUETOOTH_SCAN.getKey()); } - //------------------------------------------------------------------------// - //--- Internal methods ---------------------------------------------------// - //------------------------------------------------------------------------// - -// protected void generateDbConfiguration(boolean force) throws IOException { -// -// File destination = getDbConfigurationPath(); -// -// if (force || !destination.exists()) { -// -// // load db configuration template (tutti-db.properties) -// -// if (log.isInfoEnabled()) { -// log.info("Generate " + destination + " from classpath."); -// } -// Properties result = new Properties(); -// InputStream in = getClass().getResourceAsStream("/tutti-db-conf.properties"); -// try { -// result.load(in); -// in.close(); -// } finally { -// IOUtils.closeQuietly(in); -// } -// -// // replace some values from ApplicationConfig -// -// result.put("dataSource.jdbc.driver", getJdbcDriver().getName()); -// result.put("dataSource.jdbc.username", getJdbcUsername()); -// result.put("dataSource.jdbc.password", getJdbcPassword()); -// result.put("dataSource.jdbc.url", getJdbcUrl()); -// result.put("hibernate.dialect", getHibernateDialect().getName()); -// result.put("hibernate.show_sql", isHibernateShowSql() + ""); -// result.put("hibernate.format_sql", isHibernateFormatSql() + ""); -// result.put("hibernate.use_sql_comments", isHibernateUseSqlComment() + ""); -// result.put("ehcache.disk.store.dir", getCacheDirectory().getAbsolutePath()); -// -// // write result file at destination -// -// BufferedWriter writer = Files.newWriter(destination, Charsets.UTF_8); -// try { -// result.store(writer, "Generated by " + getClass().getName()); -// writer.close(); -// } finally { -// IOUtils.closeQuietly(writer); -// } -// } -// } - -// protected void generateDbEnumerationConfiguration(boolean force) throws IOException { -// -// File destination = getDbEnumerationPath(); -// -// if (force || !destination.exists()) { -// -// // load enumeration mapping from classpath (enumerations.properties) -// -// if (log.isInfoEnabled()) { -// log.info("Generate " + destination + " from classpath."); -// } -// -// Properties result = new Properties(); -// InputStream in = getClass().getResourceAsStream("/tutti-db-enumerations.properties"); -// try { -// result.load(in); -// in.close(); -// } finally { -// IOUtils.closeQuietly(in); -// } -// -// // replace some values from ApplicationConfig -// -// -// // write result file at destination -// -// BufferedWriter writer = -// Files.newWriter(destination, Charsets.UTF_8); -// try { -// result.store(writer, "Generated by " + getClass().getName()); -// writer.close(); -// } finally { -// IOUtils.closeQuietly(writer); -// } -// } -// } - -// public Properties getDbEnumerations() throws IOException { -// Properties result = new Properties(); -// BufferedReader in = Files.newReader(getDbEnumerationPath(), Charsets.UTF_8); -// try { -// result.load(in); -// in.close(); -// } finally { -// IOUtils.closeQuietly(in); -// } -// return result; -// } } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 35ec1c7..93daf02 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -235,7 +235,7 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { "tutti.persistence.showBatchLog", n("tutti.config.option.persistence.showBatchLog.description"), Boolean.FALSE.toString(), - boolean.class, + Boolean.class, false), SAMPLE_CATEGORY_MODEL( diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index d67f259..a3ba4ce 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -142,6 +142,7 @@ tutti.config.option.ui.coordinateEditorType.shortLabel= tutti.config.option.ui.dateFormat.shortLabel= tutti.config.option.ui.fullBluetoothScan.shortLabel= tutti.config.option.ui.individualObservationRowsToCreate.shortLabel= +tutti.config.option.ui.showBatchLog.shortLabel= tutti.config.option.update.application.url.shortLabel= tutti.config.option.update.data.url.shortLabel= tutti.config.option.weight.unit.accidentalCatch.shortLabel= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 14046ae..315574a 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -132,8 +132,8 @@ tutti.config.option.ui.config.file.shortLabel=Chemin du fichier de confirmation tutti.config.option.ui.coordinateEditorType.shortLabel=Formateur de coordonnées tutti.config.option.ui.dateFormat.shortLabel=Format des dates tutti.config.option.ui.fullBluetoothScan.shortLabel=Recherche complête des périphériques bluetooth -tutti.config.option.ui.showBatchLog.shortLabel=Voir la structure des lôts dans les logs tutti.config.option.ui.individualObservationRowsToCreate.shortLabel=Nombre max de données individuelles +tutti.config.option.ui.showBatchLog.shortLabel=Voir la structure des lôts dans les logs tutti.config.option.update.application.url.shortLabel=URL de mise à jour des applicatifs tutti.config.option.update.data.url.shortLabel=URL de mise à jour des données tutti.config.option.weight.unit.accidentalCatch.shortLabel=Unité capture accidentelle -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.