This is an automated email from the git hooks/post-receive script. New commit to branch support/3.13.x in repository tutti. See http://git.codelutin.com/tutti.git commit e4a86ed1ed185a072ca5dc9903b112156bce80a1 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 | 6 ++++++ .../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, 27 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 d2b84b1..f4c73ad 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -423,6 +423,12 @@ public class TuttiConfiguration extends ApplicationConfiguration { return result; } + + public boolean isShowMemoryUsage() { + boolean result = applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.SHOW_MEMORY_USAGE.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 c36c1ba..7e72096 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), + SAMPLE_CATEGORY_MODEL( "tutti.persistence.SampleCategoryModel", n("tutti.config.option.persistence.SampleCategoryModel.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 4d88b4f..03b38a9 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 @@ -36,6 +36,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 935d2fa..69efcb2 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 @@ -32,6 +32,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 5a1badf..f6ef03a 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 @@ -874,6 +874,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 b833804..8b2762f 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 @@ -297,3 +297,7 @@ _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 7f00e16..f0c0528 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) + ; TuttiUIContext context = getContext(); 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 54f0970..ca8504a 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 @@ -166,6 +166,7 @@ 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.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 0f0a2b6..9f7b40e 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 @@ -148,6 +148,7 @@ 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.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>.