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 2feb60cf43ea6063d1996924e16a2d48445b948f Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Mar 30 19:11:38 2015 +0200 fixes #6883: [ERGO] Masquer par défaut la jauge mémoire --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 5 +++++ .../src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/tutti-persistence_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java | 2 ++ .../src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css | 4 ++++ .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 1 + .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 9 files changed, 26 insertions(+) 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 9b9707b..4b10a48 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -424,6 +424,11 @@ public class TuttiConfiguration extends ApplicationConfiguration { return result; } + public boolean isShowMemoryUsage() { + boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.SHOW_MEMORY_USAGE.getKey()); + return result; + } + public boolean isGenericFormatImportSkipBackup() { boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.GENERIC_FORMAT_IMPORT_SKIP_BACKUP.getKey()); 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 bdd105d..06f4747 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -246,6 +246,13 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { Boolean.class, false), + SHOW_MEMORY_USAGE( + "tutti.persistence.showMemoryUsage", + n("tutti.config.option.persistence.showMemoryUsage.description"), + Boolean.FALSE.toString(), + Boolean.class, + false), + GENERIC_FORMAT_IMPORT_SKIP_BACKUP( "tutti.genericFormat.import.skipBackup", n("tutti.config.option.genericFormat.import.skipBackup.description"), 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 ed8f0fb..0cfe9dc 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 @@ -38,6 +38,7 @@ 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.persistence.showMemoryUsage.description= tutti.config.option.programId.description= tutti.config.option.protocolId.description= tutti.config.option.report.backup.directory.description= 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 5e7214a..c1a6336 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 @@ -34,6 +34,7 @@ tutti.config.option.persistence.jdbc.password.description=Mot de passe de l'util 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.persistence.showMemoryUsage.description=Voir l'utilisation de la mémoire 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 diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java index c16bdb4..89ed791 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/TuttiUIContext.java @@ -878,6 +878,8 @@ public class TuttiUIContext extends AbstractBean implements Closeable, UIMessage config.save(); } + + //------------------------------------------------------------------------// //-- UI methods --// //------------------------------------------------------------------------// diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css index ad4eb77..c57300b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css @@ -327,3 +327,7 @@ JMenu { _help: {"tutti.main.help"}; } +#status { + showMemoryStatus: {model.getConfig().isShowMemoryUsage()}; +} + 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 3b0ab72..aa6f6e8 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 @@ -139,6 +139,10 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.SHOW_BATCH_LOG) .setOptionShortLabel(t("tutti.config.option.ui.showBatchLog.shortLabel")) + .addOption(TuttiConfigurationOption.SHOW_MEMORY_USAGE) + .setOptionShortLabel(t("tutti.config.option.ui.showMemoryUsage.shortLabel")) + .setOptionCallBack(CALLBACK_UI) + .addOption(TuttiConfigurationOption.GENERIC_FORMAT_IMPORT_SKIP_BACKUP) .setOptionShortLabel(t("tutti.config.option.ui.genericFormat.import.skipBackup.shortLabel")) 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 1f7d8db..6fb61d3 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 @@ -170,6 +170,7 @@ tutti.config.option.ui.fullBluetoothScan.shortLabel= tutti.config.option.ui.genericFormat.import.skipBackup.shortLabel= tutti.config.option.ui.individualObservationRowsToCreate.shortLabel= tutti.config.option.ui.showBatchLog.shortLabel= +tutti.config.option.ui.showMemoryUsage.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 5d71199..bde985d 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 @@ -152,6 +152,7 @@ tutti.config.option.ui.fullBluetoothScan.shortLabel=Recherche complète des pér tutti.config.option.ui.genericFormat.import.skipBackup.shortLabel=Ne pas faire de sauvegarde avant un import au format générique tutti.config.option.ui.individualObservationRowsToCreate.shortLabel=Nombre max de données individuelles tutti.config.option.ui.showBatchLog.shortLabel=Voir la structure des lots dans les logs +tutti.config.option.ui.showMemoryUsage.shortLabel=Voir l'utilisation de la mémoire 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>.