[tutti] branch develop updated (7f31831 -> 02fb1cb)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 7f31831 refs-80 #5784: [SYNCHRO] Gérer les changements d'id dans les transcodages de taxon new 77f7b60 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs new 02fb1cb fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: 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 commit 77f7b609268eaabbc392cc5e7ef516a8946debb2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 13 08:40:31 2014 +0200 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs Summary of changes: .../java/fr/ifremer/tutti/TuttiConfiguration.java | 101 +-------------------- .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++ .../service/CatchBatchPersistenceServiceImpl.java | 9 +- .../i18n/tutti-persistence_en_GB.properties | 48 +--------- .../i18n/tutti-persistence_fr_FR.properties | 48 +--------- .../swing/content/config/TuttiConfigUIHandler.java | 9 +- .../resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 8 files changed, 27 insertions(+), 197 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 77f7b609268eaabbc392cc5e7ef516a8946debb2 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 13 08:40:31 2014 +0200 fixes #5790: [TECHNIQUE] Ajout d'une option pour voir la structure des lots dans les logs --- .../java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++ .../fr/ifremer/tutti/TuttiConfigurationOption.java | 7 ++++ .../service/CatchBatchPersistenceServiceImpl.java | 9 +++- .../i18n/tutti-persistence_en_GB.properties | 48 +--------------------- .../i18n/tutti-persistence_fr_FR.properties | 48 +--------------------- .../swing/content/config/TuttiConfigUIHandler.java | 9 ++-- .../resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 7 files changed, 26 insertions(+), 101 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 f9d3c6a..6562e04 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -387,6 +387,11 @@ public class TuttiConfiguration extends ApplicationConfiguration { return result; } + public boolean isShowBatchLog() { + boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.SHOW_BATCH_LOG.getKey()); + return result; + } + @Override public String getApplicationName() { return "Allegro Campagne"; 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 c1c6112..35ec1c7 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -231,6 +231,13 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { boolean.class, false), + SHOW_BATCH_LOG( + "tutti.persistence.showBatchLog", + n("tutti.config.option.persistence.showBatchLog.description"), + Boolean.FALSE.toString(), + boolean.class, + false), + SAMPLE_CATEGORY_MODEL( "tutti.persistence.SampleCategoryModel", n("tutti.config.option.persistence.SampleCategoryModel.description"), diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java index 24d7b12..c207460 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CatchBatchPersistenceServiceImpl.java @@ -31,6 +31,7 @@ import fr.ifremer.adagio.core.dao.data.measure.QuantificationMeasurement; import fr.ifremer.adagio.core.dao.data.operation.FishingOperationImpl; import fr.ifremer.adagio.core.dao.referential.QualityFlagCode; import fr.ifremer.adagio.core.dao.referential.QualityFlagImpl; +import fr.ifremer.tutti.TuttiConfiguration; import fr.ifremer.tutti.util.Numbers; import fr.ifremer.tutti.util.Weights; import fr.ifremer.tutti.persistence.entities.data.CatchBatch; @@ -107,7 +108,13 @@ public class CatchBatchPersistenceServiceImpl log.debug("Loaded CatchBatch: " + source.getId()); } - batchTreeHelper.displayCatchBatch(source); + boolean showBatchLog = TuttiConfiguration.getInstance().isShowBatchLog(); + + if (showBatchLog) { + + batchTreeHelper.displayCatchBatch(source); + + } CatchBatch result = new CatchBatchBean(); diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index 638a1f8..aab6417 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -1,43 +1,4 @@ -adagio.enumeration.MatrixId.PRODUCT_BATCH.description= -adagio.enumeration.ObjectTypeCode.ACTIVITY_CALENDAR.description= -adagio.enumeration.ObjectTypeCode.BATCH.description= -adagio.enumeration.ObjectTypeCode.CATCH_BATCH.description= -adagio.enumeration.ObjectTypeCode.DAILY_ACTIVITY_CALENDAR.description= -adagio.enumeration.ObjectTypeCode.FISHING_TRIP.description= -adagio.enumeration.ObjectTypeCode.LANDING.description= -adagio.enumeration.ObjectTypeCode.OPERATION.description= -adagio.enumeration.ObjectTypeCode.SALE.description= -adagio.enumeration.ObjectTypeCode.SAMPLE.description= -adagio.enumeration.ObjectTypeCode.SCIENTIFIC_CRUISE.description= -adagio.enumeration.PmfmId.AGE.description= -adagio.enumeration.PmfmId.DEAD_OR_ALIVE.description= -adagio.enumeration.PmfmId.HAUL_VALID.description= -adagio.enumeration.PmfmId.HORIZONTAL_OPENING_DOOR.description= -adagio.enumeration.PmfmId.HORIZONTAL_OPENING_WINGS.description= adagio.enumeration.PmfmId.ID_PSFM.description= -adagio.enumeration.PmfmId.MARINE_LITTER_SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.MARINE_LITTER_TYPE.description= -adagio.enumeration.PmfmId.MATURITY.description= -adagio.enumeration.PmfmId.MULTIRIG_AGGREGATION.description= -adagio.enumeration.PmfmId.MULTIRIG_NUMBER.description= -adagio.enumeration.PmfmId.RECTILINEAR_OPERATION.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE2.description= -adagio.enumeration.PmfmId.SEX.description= -adagio.enumeration.PmfmId.SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.SORTED_UNSORTED.description= -adagio.enumeration.PmfmId.SORTING_TYPE_TCC.description= -adagio.enumeration.PmfmId.STATION_NUMBER.description= -adagio.enumeration.PmfmId.SURVEY_PART.description= -adagio.enumeration.PmfmId.TRAWL_DISTANCE.description= -adagio.enumeration.PmfmId.VERTICAL_OPENING.description= -adagio.enumeration.PmfmId.WEIGHT_MEASURED.description= -adagio.enumeration.QualitativeValueId.MATURITY_1.description= -adagio.enumeration.QualitativeValueId.MATURITY_2.description= -adagio.enumeration.QualitativeValueId.MATURITY_3.description= -adagio.enumeration.QualitativeValueId.MATURITY_4.description= -adagio.enumeration.QualitativeValueId.MATURITY_5.description= -adagio.enumeration.QualitativeValueId.SEX_UNDEFINED.description= application.common.unit=Unit application.common.unit.g=Gram application.common.unit.kg=Kilogram @@ -59,21 +20,18 @@ tutti.config.option.persistence.SampleCategoryModel.description= tutti.config.option.persistence.db.attachment.directory.description= tutti.config.option.persistence.db.backup.directory.description= tutti.config.option.persistence.db.cache.directory.description= -tutti.config.option.persistence.db.configurationPath.description= tutti.config.option.persistence.db.directory.description= -tutti.config.option.persistence.db.enumeration.path= -tutti.config.option.persistence.db.enumerationPath.description= tutti.config.option.persistence.db.name.description= tutti.config.option.persistence.db.protocol.directory.description= tutti.config.option.persistence.hibernate.dialect.description= tutti.config.option.persistence.hibernate.formatSql.description= -tutti.config.option.persistence.hibernate.queriesFile.description= tutti.config.option.persistence.hibernate.showSql.description= tutti.config.option.persistence.hibernate.useSqlComment.description= tutti.config.option.persistence.jdbc.driver.description= tutti.config.option.persistence.jdbc.password.description= tutti.config.option.persistence.jdbc.url.description= tutti.config.option.persistence.jdbc.username.description= +tutti.config.option.persistence.showBatchLog.description= tutti.config.option.programId.description= tutti.config.option.protocolId.description= tutti.config.option.report.backup.directory.description= @@ -126,7 +84,6 @@ tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId= tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId.order= tutti.persistence.batch.validation.invalid.species.sampleCategoryId= tutti.persistence.batch.validation.invalid.species.sampleCategoryId.order= -tutti.persistence.batch.validation.unkonwn.taxon= tutti.persistence.batch.validation.unsortedNotFound= tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound= tutti.persistence.batch.validation.vracBenthosInertNotFound= @@ -138,11 +95,8 @@ tutti.persistence.batch.validation.vracSpeciesInertNotFound= tutti.persistence.batch.validation.vracSpeciesLifeNotFound= tutti.persistence.batch.validation.vracSpeciesNotFound= tutti.persistence.benthosBatch.validation.unkonwn.taxon= -tutti.persistence.config.generateEnumFile.error= -tutti.persistence.config.generateFile.error= tutti.persistence.cruise.gearUsedInOperations.error= tutti.persistence.db.sanity.description= -tutti.persistence.dbMetadata.instanciation.error= tutti.persistence.error.caracteristic.notFound= tutti.persistence.error.no.convertor= tutti.persistence.error.protocol.benthos.not.found= diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index b73f810..1d7f613 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -1,43 +1,4 @@ -adagio.enumeration.MatrixId.PRODUCT_BATCH.description= -adagio.enumeration.ObjectTypeCode.ACTIVITY_CALENDAR.description= -adagio.enumeration.ObjectTypeCode.BATCH.description= -adagio.enumeration.ObjectTypeCode.CATCH_BATCH.description= -adagio.enumeration.ObjectTypeCode.DAILY_ACTIVITY_CALENDAR.description= -adagio.enumeration.ObjectTypeCode.FISHING_TRIP.description= -adagio.enumeration.ObjectTypeCode.LANDING.description= -adagio.enumeration.ObjectTypeCode.OPERATION.description= -adagio.enumeration.ObjectTypeCode.SALE.description= -adagio.enumeration.ObjectTypeCode.SAMPLE.description= -adagio.enumeration.ObjectTypeCode.SCIENTIFIC_CRUISE.description= -adagio.enumeration.PmfmId.AGE.description= -adagio.enumeration.PmfmId.DEAD_OR_ALIVE.description= -adagio.enumeration.PmfmId.HAUL_VALID.description= -adagio.enumeration.PmfmId.HORIZONTAL_OPENING_DOOR.description= -adagio.enumeration.PmfmId.HORIZONTAL_OPENING_WINGS.description= adagio.enumeration.PmfmId.ID_PSFM.description= -adagio.enumeration.PmfmId.MARINE_LITTER_SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.MARINE_LITTER_TYPE.description= -adagio.enumeration.PmfmId.MATURITY.description= -adagio.enumeration.PmfmId.MULTIRIG_AGGREGATION.description= -adagio.enumeration.PmfmId.MULTIRIG_NUMBER.description= -adagio.enumeration.PmfmId.RECTILINEAR_OPERATION.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE.description= -adagio.enumeration.PmfmId.SCIENTIFIC_CRUISE_SORTING_TYPE2.description= -adagio.enumeration.PmfmId.SEX.description= -adagio.enumeration.PmfmId.SIZE_CATEGORY.description= -adagio.enumeration.PmfmId.SORTED_UNSORTED.description= -adagio.enumeration.PmfmId.SORTING_TYPE_TCC.description= -adagio.enumeration.PmfmId.STATION_NUMBER.description= -adagio.enumeration.PmfmId.SURVEY_PART.description= -adagio.enumeration.PmfmId.TRAWL_DISTANCE.description= -adagio.enumeration.PmfmId.VERTICAL_OPENING.description= -adagio.enumeration.PmfmId.WEIGHT_MEASURED.description= -adagio.enumeration.QualitativeValueId.MATURITY_1.description= -adagio.enumeration.QualitativeValueId.MATURITY_2.description= -adagio.enumeration.QualitativeValueId.MATURITY_3.description= -adagio.enumeration.QualitativeValueId.MATURITY_4.description= -adagio.enumeration.QualitativeValueId.MATURITY_5.description= -adagio.enumeration.QualitativeValueId.SEX_UNDEFINED.description= application.common.unit=Unité application.common.unit.g=Gramme application.common.unit.kg=Kilogramme @@ -59,21 +20,18 @@ tutti.config.option.persistence.SampleCategoryModel.description=Configuration de tutti.config.option.persistence.db.attachment.directory.description=Répertoire où sont stockées les pièces-jointes tutti.config.option.persistence.db.backup.directory.description=Répertoire où sont enregistrées les sauvegardes de la base tutti.config.option.persistence.db.cache.directory.description=Répertoire où sont stockées les caches de persistance -tutti.config.option.persistence.db.configurationPath.description=Chemin du fichier de configuration d'Adagio tutti.config.option.persistence.db.directory.description=Répertoire où est la base de données -tutti.config.option.persistence.db.enumeration.path= -tutti.config.option.persistence.db.enumerationPath.description=Chemin du fichier de correspondance des constantes tutti.config.option.persistence.db.name.description=Nom du fichier de la base de données tutti.config.option.persistence.db.protocol.directory.description=Répertoire où sont conservés les protocoles tutti.config.option.persistence.hibernate.dialect.description=Le dialecte hibernate utilisée pour communiquer avec la base de données tutti.config.option.persistence.hibernate.formatSql.description=Option pour ajouter les commentaires dans les requêtes sql générées -tutti.config.option.persistence.hibernate.queriesFile.description=Option pour changer les requêtes supplémentaires tutti.config.option.persistence.hibernate.showSql.description=Option pour afficher ou non les requête sql dans les logs tutti.config.option.persistence.hibernate.useSqlComment.description=Option pour ajouter les commentaires dans les requêtes sql générées tutti.config.option.persistence.jdbc.driver.description=Le pilote JDBC utilisé pour communiquer avec la base de données tutti.config.option.persistence.jdbc.password.description=Mot de passe de l'utilisateur pour se connecter à la base de données tutti.config.option.persistence.jdbc.url.description=URL de connexion à la base de données tutti.config.option.persistence.jdbc.username.description=Login de l'utilisateur pour se connecter à la base de données +tutti.config.option.persistence.showBatchLog.description=Pour afficher dans les logs les détails de la structure d'un lot lors de son chargement. tutti.config.option.programId.description=Identifiant de la dernière série de campagne utilisée tutti.config.option.protocolId.description=Identifiant du dernier protocole utilisé tutti.config.option.report.backup.directory.description=Répertoire contenant les rapports générés @@ -126,7 +84,6 @@ tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId=Le lot benth tutti.persistence.batch.validation.invalid.benthos.sampleCategoryId.order=Le lot benthos %s (espèce %s) ne respecte pas l'ordre des catégories, utilisation de la catégorie <strong>%s</strong> après la catégories <strong>%s</strong> tutti.persistence.batch.validation.invalid.species.sampleCategoryId=Le lot espèce %s (espèce %s) utilise une catégorise (id %s) non reconnue tutti.persistence.batch.validation.invalid.species.sampleCategoryId.order=Le lot espèce %s (espèce %s) ne respecte pas l'ordre des catégories, utilisation de la catégorie <strong>%s</strong> après la catégorie <strong>%s</strong> -tutti.persistence.batch.validation.unkonwn.taxon=Le lot (%s) utilise une espèce de code inconnu (%s). tutti.persistence.batch.validation.unsortedNotFound=Lot 'Hors Vrac > Espèces' non trouvé ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracBenthosAliveItemizedNotFound=Lot 'Vrac > Benthos > Vivant Trié' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracBenthosInertNotFound=Lot 'Vrac > Benthos > Inerte' non trouvé, ou configuré avec d'autres critères de classement. @@ -138,11 +95,8 @@ tutti.persistence.batch.validation.vracSpeciesInertNotFound=Lot 'Vrac > Espèces tutti.persistence.batch.validation.vracSpeciesLifeNotFound=Lot 'Vrac > Espèces > Vivant' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.batch.validation.vracSpeciesNotFound=Lot 'Vrac > Espèces' non trouvé, ou configuré avec d'autres critères de classement. tutti.persistence.benthosBatch.validation.unkonwn.taxon=Opération %s - e lot benthos (%s) utilise une espèce de code inconnu (%s). -tutti.persistence.config.generateEnumFile.error=Erreur lors de la génération du fichier d'énumération de la configuration de la base de données -tutti.persistence.config.generateFile.error=Erreur lors de la génération du fichier de configuration de la base de données tutti.persistence.cruise.gearUsedInOperations.error=Vous essayez d'enlever un ou plusieurs engins qui sont utilisés sur des traits.<hr/>Veuillez changer l'engin des traits en question pour pouvoir les enlever de la campagne. tutti.persistence.db.sanity.description=Mettre à vrai pour nettoyer les bases au chargement -tutti.persistence.dbMetadata.instanciation.error=Erreur lors de l'initialisation des metadata de la base de données par la connexion %s tutti.persistence.error.caracteristic.notFound=Caractéristique inconnue tutti.persistence.error.no.convertor=Impossible de convertir en modèle de catégorie le type %s avec la valeur %s tutti.persistence.error.protocol.benthos.not.found=Le protocole utilise des benthos non connus dans le référentiel \: <ul>%s</ul> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index 68a4e34..43344e3 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -128,6 +128,9 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.FULL_BLUETOOTH_SCAN) .setOptionShortLabel(t("tutti.config.option.ui.fullBluetoothScan.shortLabel")) + .addOption(TuttiConfigurationOption.SHOW_BATCH_LOG) + .setOptionShortLabel(t("tutti.config.option.ui.showBatchLog.shortLabel")) + ; TuttiUIContext context = getContext(); @@ -239,12 +242,6 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.DB_CACHE_DIRECTORY) .setOptionShortLabel(t("tutti.config.option.persistence.db.cache.directory.shortLabel")) -// .addOption(TuttiConfigurationOption.DB_CONFIGURATION_PATH) -// .setOptionShortLabel(t("tutti.config.option.persistence.db.configurationPath.shortLabel")) -// -// .addOption(TuttiConfigurationOption.DB_ENUMERATION_PATH) -// .setOptionShortLabel(t("tutti.config.option.persistence.db.enumerationPath.shortLabel")) - .addOption(TuttiConfigurationOption.JDBC_URL) .setOptionShortLabel(t("tutti.config.option.persistence.jdbc.url.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 53ae0d0..14046ae 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,6 +132,7 @@ 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.update.application.url.shortLabel=URL de mise à jour des applicatifs tutti.config.option.update.data.url.shortLabel=URL de mise à jour des données -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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>.
participants (1)
-
codelutin.com scm