[Observe-commits] 01/01: Simplification de la configuration (Fixes #8545)

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit d84f9fe2c52b405d31a3c9c4198a94d368864a96 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Sep 19 17:50:11 2016 +0200 Simplification de la configuration (Fixes #8545) --- .../ObserveSwingApplicationConfigOption.java | 52 ++--- ...pplication-swing-configuration_en_GB.properties | 4 - ...pplication-swing-configuration_es_ES.properties | 4 - ...pplication-swing-configuration_fr_FR.properties | 6 +- .../swing/ui/actions/ShowConfigAction.java | 228 +++++++-------------- .../i18n/application-swing_en_GB.properties | 26 +-- .../i18n/application-swing_es_ES.properties | 26 +-- .../i18n/application-swing_fr_FR.properties | 26 +-- 8 files changed, 127 insertions(+), 245 deletions(-) diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java index 6b53610..5102b47 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfigOption.java @@ -84,7 +84,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "data.directory", n("observe.config.defaultDataDirectory.description"), - "${user.home}/.observe" + "${user.home}/.observe", + true, + true ), /** le repertoire ou est stoquee la base locale */ @@ -92,7 +94,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "db.directory", n("observe.config.defaultLocalDbDirectory.description"), - "${data.directory}/db" + "${data.directory}/db", + true, + true ), /** @@ -111,7 +115,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "backup.directory", n("observe.config.defaultBackupDirectory.description"), - "${data.directory}/backup" + "${data.directory}/backup", + true, + true ), /** le repertoire ou sont stockees toutes les ressources de l'utilisateur */ @@ -119,7 +125,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "resources.directory", n("observe.config.defaultResourcesDirectory.description"), - "${data.directory}/resources-${version}" + "${data.directory}/resources-${version}", + true, + true ), /** le repertoire ou sont stockees les traduction i18n de l'utilisateur */ @@ -127,7 +135,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "i18n.directory", n("observe.config.defaultI18nDirectory.description"), - "${resources.directory}/i18n" + "${resources.directory}/i18n", + true, + true ), /** le repertoire ou sont stockees les reports de l'utilisateur */ @@ -135,7 +145,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "report.directory", n("observe.config.defaultReportDirectory.description"), - "${resources.directory}/report" + "${resources.directory}/report", + true, + true ), /** le repertoire ou sont stockees les cartes de l'utilisateur */ @@ -143,7 +155,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "map.directory", n("observe.config.defaultMapDirectory.description"), - "${resources.directory}/map" + "${resources.directory}/map", + true, + true ), /** le repertoire ou sont stockees les reports de validation de l'utilisateur */ @@ -151,7 +165,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "validation.report.directory", n("observe.config.defaultValidationReportDirectory.description"), - "${data.directory}/validation-report" + "${data.directory}/validation-report", + true, + true ), /** le repertoire temporaire (utilise pour les base de synchro) */ @@ -159,7 +175,9 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { File.class, "tmp.directory", n("observe.config.defaultTmpDirectory.description"), - "${data.directory}/tmp" + "${data.directory}/tmp", + true, + true ), /** Le chemin du fichier de configuration des logs. */ @@ -346,22 +364,6 @@ public enum ObserveSwingApplicationConfigOption implements ConfigOptionDef { ), // gps default values - /** temps maximum autorise en deux points gps */ - DEFAULT_GPS_MAX_DELAY( - Integer.class, - "defaultGpsMaxDelay", - n("observe.config.defaultGpsMaxDelay"), - "60" - ), - - /** vitesse maximum (en noeud) entre deux points gps */ - DEFAULT_GPS_MAX_SPEED( - Float.class, - "defaultGpsMaxSpeed", - n("observe.config.defaultGpsMaxSpeed"), - "25.0f" - ), - // synchro actions options /** flag pour autoriser le choix de la base source */ diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties index a0a25e8..64b088c 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -16,8 +16,6 @@ observe.config.defaultBackupDirectory.description=Default directory where are st observe.config.defaultCreationMode=Default creation mode of new local data source observe.config.defaultDataDirectory.description=Default user directory observe.config.defaultDbMode=Default db mode -observe.config.defaultGpsMaxDelay=Default maximum range of minutes between two Gps points -observe.config.defaultGpsMaxSpeed=Maximum speed observe.config.defaultI18nDirectory.description=Default i18n directory where to store i18n resources observe.config.defaultInitialDbDump.description=Default location of initial database observe.config.defaultLocalDbDirectory.description=Default directory where to store local data source @@ -85,5 +83,3 @@ observe.config.validation.speedEnable=Force validation of activities speed observe.config.validation.speedMaxValue=Max speed value used in activities speed validation observe.message.save.configuration=Save configuration in file %1$s observe.model.version=Model version -observe.runner.config.migrate.file=Le fichier de configuration %1$s a été déplacée de \n%2$s\nvers\n%3$s -observe.title.config.migrate=Move configuration file diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties index f85b4aa..1c8b241 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -16,8 +16,6 @@ observe.config.defaultBackupDirectory.description=Carpeta por defecto para copia observe.config.defaultCreationMode=Modo de creación de la base local por defecto observe.config.defaultDataDirectory.description=Directorio por defecto de los recursos de usuario de la aplicación observe.config.defaultDbMode=Modo de conexión creado por defecto -observe.config.defaultGpsMaxDelay=Número de minutos máximos por defectro entre 2 puntos gps -observe.config.defaultGpsMaxSpeed=Velocidad máxima por defecto entre 2 puntos pgs observe.config.defaultI18nDirectory.description=Directorio por defecto de recursos de traducción de la aplicación observe.config.defaultInitialDbDump.description=Base empotrada creada durante la primera importación de una base remota observe.config.defaultLocalDbDirectory.description=Directorio de almacenamiento de la base local @@ -85,5 +83,3 @@ observe.config.validation.speedEnable=Force validation of activities speedTODO observe.config.validation.speedMaxValue=Max speed value used in activities speed validationTODO observe.message.save.configuration=Guardar la configuración en el archivo %1$s observe.model.version=Versión del modelo de datos -observe.runner.config.migrate.file=El fichero de configuración %1$s ha sido reemplazado por \n%2$s\nhacia\n%3$s -observe.title.config.migrate=Cambio de la ubicación del archivo de configuración diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index 5351e51..69b2378 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -16,8 +16,6 @@ observe.config.defaultBackupDirectory.description=Répertoire par défaut où sa observe.config.defaultCreationMode=Le mode de création de base locale par défaut observe.config.defaultDataDirectory.description=Répertoire par défault des resources utilisateurs de l'application observe.config.defaultDbMode=Le mode de connexion a créer par défaut -observe.config.defaultGpsMaxDelay=Le nombre par défaut de minutes maximum entre deux points gps -observe.config.defaultGpsMaxSpeed=La vitesse maximum par défaut en tre deux points gps observe.config.defaultI18nDirectory.description=Répertoire par défaut des resources de traduction de l'application observe.config.defaultInitialDbDump.description=La base embarquée créee lors de le premier import d'une base distante. observe.config.defaultLocalDbDirectory.description=Le répertoire où est stockée la base locale. @@ -62,7 +60,7 @@ observe.config.server.dataBaseName.description=Le nom optionel de la base cible observe.config.server.login.description=Identifiant de l'utilisateur observe.config.server.password.description=Le mot de passe de l'utilisateur observe.config.server.url.description=L'url du serveur -observe.config.showMigrationProgression=Affichier dans les logs la progression de la mise à jour d'une base +observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base observe.config.showSql=Afficher dans les logs toutes les requêtes sql executées observe.config.speciesList.longline.catch=Espèces pour les captures - TDR @@ -85,5 +83,3 @@ observe.config.validation.speedEnable=Forcer la validation des vitesses d'activi observe.config.validation.speedMaxValue=Vitesse maximale autorisée dans le contrôle des vitesses d'activités observe.message.save.configuration=Sauvegarde de la configuration dans le fichier %1$s observe.model.version=Version du modèle de données -observe.runner.config.migrate.file=Le fichier de configuration %1$s a été déplacée de \n%2$s\nvers\n%3$s -observe.title.config.migrate=Déplacement du fichier de configuration diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java index 6f9296a..b9f0530 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java @@ -103,7 +103,7 @@ public class ShowConfigAction extends AbstractAction { helper = buildUI(config, dataSource); - helper.buildUI(ui, "observe.config.category.directories"); + helper.buildUI(ui, "observe.config.category.application"); helper.displayUI(ui, false); @@ -131,7 +131,6 @@ public class ShowConfigAction extends AbstractAction { ObserveConfigUIBuilder helper = new ObserveConfigUIBuilder(config, editor, renderer); - for (ObserveUICallback callback : ObserveUICallback.values()) { helper.registerCallBack(callback); } @@ -140,131 +139,82 @@ public class ShowConfigAction extends AbstractAction { helper.setCloseAction(ObserveMainUIHandler::restartEdit); - // categorie repertoires - addDirectoriesOptions(helper); - - // categorie h2 - addH2Options(helper); - - // categorie obtuna - addObstunaOptions(helper); - - // categorie change storage - addChangeStorageOptions(helper); - - // categorie gps - addGpsOptions(helper); - - // categorie synchro - addSynchroOptions(helper); - - // categorie observations (seine) - addObservationsOptions(helper); - - if (dataSource != null) { - - // categorie speciesList (seine) - addSeineSpeciesListOptions(helper); - - // categorie speciesList (longline) - addLonglineSpeciesListOptions(helper); - - } - - // catégories map - addMapOptions(helper); - - // others - addOthersOptions(helper); - - // validation - addValidationOptions(helper); + addApplicatinOptions(helper); + addUiOptions(helper); + addDataOptions(helper, dataSource); + addExpertOptions(helper); + addTechnicalOptions(helper); return helper; } - protected void addDirectoriesOptions(ObserveConfigUIBuilder helper) { + private void addApplicatinOptions(ObserveConfigUIBuilder helper) { - helper.addCategory( - n("observe.config.category.directories"), - n("observe.config.category.directories.description")); + helper.addCategory(n("observe.config.category.application"), + n("observe.config.category.application.description"), + ObserveUICallback.application.name()); - helper.addOption(ObserveSwingApplicationConfigOption.CONFIG_FILE); - helper.addOption(ObserveSwingApplicationConfigOption.DATA_DIRECTORY); - helper.addOption(ObserveSwingApplicationConfigOption.DB_DIRECTORY); - helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY); - helper.addOption(ObserveSwingApplicationConfigOption.TMP_DIRECTORY); - helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY); - helper.addOption(ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY, ObserveUICallback.application); - - } - - protected void addH2Options(ObserveConfigUIBuilder helper) { - - helper.addCategory(n("observe.config.category.h2"), - n("observe.config.category.h2.description")); - - helper.addOption(ObserveSwingApplicationConfigOption.H2_LOGIN); - helper.addOption(ObserveSwingApplicationConfigOption.H2_PASSWORD); - helper.addOption(ObserveSwingApplicationConfigOption.H2_CAN_MIGRATE); - helper.addOption(ObserveSwingApplicationConfigOption.H2_SERVER_PORT); - - } - - protected void addObstunaOptions(ObserveConfigUIBuilder helper) { - - helper.addCategory(n("observe.config.category.obstuna"), - n("observe.config.category.obstuna.description")); + helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_SPEED_ENABLE); + helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_SPEED_MAX_VALUE); helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_URL); helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_LOGIN); helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_USE_SSL_CERT); - helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_CAN_MIGRATE, ObserveUICallback.db); + + helper.addOption(ObserveSwingApplicationConfigOption.SERVER_URL); + helper.addOption(ObserveSwingApplicationConfigOption.SERVER_LOGIN); + helper.addOption(ObserveSwingApplicationConfigOption.SERVER_DATABASE_NAME); } - protected void addChangeStorageOptions(ObserveConfigUIBuilder helper) { + protected void addUiOptions(ObserveConfigUIBuilder helper) { - helper.addCategory( - n("observe.config.category.changeStorage"), - n("observe.config.category.changeStorage.description")); + helper.addCategory(n("observe.config.category.ui"), + n("observe.config.category.ui.description"), + ObserveUICallback.ui.name()); + + helper.addOption(ObserveSwingApplicationConfigOption.SHOW_NUMBER_EDITOR_BUTTON); + helper.addOption(ObserveSwingApplicationConfigOption.AUTO_POPUP_NUMBER_EDITOR); + helper.addOption(ObserveSwingApplicationConfigOption.SHOW_DATE_TIME_EDITOR_SLIDER); helper.addOption(ObserveSwingApplicationConfigOption.DEFAULT_DB_MODE); helper.addOption(ObserveSwingApplicationConfigOption.DEFAULT_CREATION_MODE); helper.addOption(ObserveSwingApplicationConfigOption.STORE_REMOTE_STORAGE); - helper.addOption(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_PROGRESSION); - helper.addOption(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_SQL); - helper.addOption(ObserveSwingApplicationConfigOption.SHOW_SQL, ObserveUICallback.application); - } + helper.addOption(ObserveSwingApplicationConfigOption.MAP_BACKGROUND_COLOR); + ObserveSwingApplicationConfigOption.MAP_LAYERS.forEach(helper::addOption); + helper.addOption(ObserveSwingApplicationConfigOption.MAP_STYLE_FILE); - protected void addGpsOptions(ObserveConfigUIBuilder helper) { + } - helper.addCategory(n("observe.config.category.gps"), - n("observe.config.category.gps.description")); + protected void addDataOptions(ObserveConfigUIBuilder helper, ObserveSwingDataSource dataSource) { - helper.addOption(ObserveSwingApplicationConfigOption.DEFAULT_GPS_MAX_DELAY); - helper.addOption(ObserveSwingApplicationConfigOption.DEFAULT_GPS_MAX_SPEED); + if (dataSource != null) { - } + helper.addCategory(n("observe.config.category.speciesList.seine"), + n("observe.config.category.speciesList.seine.description"), + ObserveUICallback.ui.name()); - protected void addSynchroOptions(ObserveConfigUIBuilder helper) { + helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_TARGET_CATCH_ID); + helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID); + helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID); + helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID); + helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID); - helper.addCategory(n("observe.config.category.synchro"), - n("observe.config.category.synchro.description")); + helper.addCategory(n("observe.config.category.speciesList.longline"), + n("observe.config.category.speciesList.longline.description"), + ObserveUICallback.ui.name()); - helper.addOption(ObserveSwingApplicationConfigOption.CHANGE_SYNCHRO_SRC); - helper.addOption(ObserveSwingApplicationConfigOption.H2_CAN_MIGRATE); + helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_CATCH_ID); + helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_ENCOUNTER_ID); - } - protected void addObservationsOptions(ObserveConfigUIBuilder helper) { + } - helper.addCategory( - n("observe.config.category.observation"), - n("observe.config.category.observation.description"), - ObserveUICallback.ui.name()); + helper.addCategory(n("observe.config.category.observation"), + n("observe.config.category.observation.description"), + ObserveUICallback.ui.name()); helper.addOption(ObserveSwingApplicationConfigOption.DETAILLED_ACTIVITIES_OBSERVATION); helper.addOption(ObserveSwingApplicationConfigOption.NON_TARGET_OBSERVATION); @@ -277,71 +227,43 @@ public class ShowConfigAction extends AbstractAction { } - protected void addSeineSpeciesListOptions(ObserveConfigUIBuilder helper) { + protected void addExpertOptions(ObserveConfigUIBuilder helper) { - helper.addCategory( - n("observe.config.category.speciesList.seine"), - n("observe.config.category.speciesList.seine.description"), - ObserveUICallback.ui.name()); + helper.addCategory(n("observe.config.category.expert"), + n("observe.config.category.expert.description"), + ObserveUICallback.application.name()); - helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_TARGET_CATCH_ID); - helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_SCHOOL_ESTIMATE_ID); - helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_SCHOOL_ESTIMATE_ID); - helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_NON_TARGET_CATCH_ID); - helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_SEINE_OBJECT_OBSERVED_SPECIES_ID); + helper.addOption(ObserveSwingApplicationConfigOption.LOAD_LOCAL_STORAGE); + helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_USE); + helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_DELAY); + helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_AT_CLOSE); - } - - protected void addLonglineSpeciesListOptions(ObserveConfigUIBuilder helper) { - - - helper.addCategory( - n("observe.config.category.speciesList.longline"), - n("observe.config.category.speciesList.longline.description"), - ObserveUICallback.ui.name()); - - helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_CATCH_ID); - helper.addSpeciesListOption(ObserveSwingApplicationConfigOption.SPECIES_LIST_LONGLINE_ENCOUNTER_ID); - - } - - protected void addMapOptions(ObserveConfigUIBuilder helper) { - - helper.addCategory( - n("observe.config.category.map"), - n("observe.config.category.map.description"), - ObserveUICallback.ui.name()); + helper.addOption(ObserveSwingApplicationConfigOption.CHANGE_SYNCHRO_SRC); + helper.addOption(ObserveSwingApplicationConfigOption.H2_CAN_MIGRATE); + helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_CAN_MIGRATE); + helper.addOption(ObserveSwingApplicationConfigOption.H2_SERVER_PORT); - helper.addOption(ObserveSwingApplicationConfigOption.MAP_BACKGROUND_COLOR); - ObserveSwingApplicationConfigOption.MAP_LAYERS.forEach(helper::addOption); - helper.addOption(ObserveSwingApplicationConfigOption.MAP_STYLE_FILE); + helper.addOption(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_PROGRESSION); + helper.addOption(ObserveSwingApplicationConfigOption.SHOW_MIGRATION_SQL); + helper.addOption(ObserveSwingApplicationConfigOption.SHOW_SQL); } - protected void addOthersOptions(ObserveConfigUIBuilder helper) { + protected void addTechnicalOptions(ObserveConfigUIBuilder helper) { - helper.addCategory(n("observe.config.category.other"), - n("observe.config.category.other.description")); + helper.addCategory(n("observe.config.category.technical"), + n("observe.config.category.technical.description")); - helper.addOption(ObserveSwingApplicationConfigOption.SHOW_NUMBER_EDITOR_BUTTON, ObserveUICallback.ui); - helper.addOption(ObserveSwingApplicationConfigOption.AUTO_POPUP_NUMBER_EDITOR, ObserveUICallback.ui); - helper.addOption(ObserveSwingApplicationConfigOption.SHOW_DATE_TIME_EDITOR_SLIDER, ObserveUICallback.ui); - helper.addOption(ObserveSwingApplicationConfigOption.LOAD_LOCAL_STORAGE, ObserveUICallback.application); - helper.addOption(ObserveSwingApplicationConfigOption.LOCALE, ObserveUICallback.ui); - helper.addOption(ObserveSwingApplicationConfigOption.DB_LOCALE, ObserveUICallback.ui); - helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_USE, ObserveUICallback.application); - helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_DELAY, ObserveUICallback.application); - - } - - protected void addValidationOptions(ObserveConfigUIBuilder helper) { - - helper.addCategory(n("observe.config.category.validation"), - n("observe.config.category.validation.description"), - ObserveUICallback.ui.name()); + helper.addOption(ObserveSwingApplicationConfigOption.CONFIG_FILE); + helper.addOption(ObserveSwingApplicationConfigOption.DATA_DIRECTORY); + helper.addOption(ObserveSwingApplicationConfigOption.DB_DIRECTORY); + helper.addOption(ObserveSwingApplicationConfigOption.BACKUP_DIRECTORY); + helper.addOption(ObserveSwingApplicationConfigOption.TMP_DIRECTORY); + helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_REPORT_DIRECTORY); + helper.addOption(ObserveSwingApplicationConfigOption.RESOURCES_DIRECTORY); - helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_SPEED_ENABLE); - helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_SPEED_MAX_VALUE); + helper.addOption(ObserveSwingApplicationConfigOption.H2_LOGIN); + helper.addOption(ObserveSwingApplicationConfigOption.H2_PASSWORD); } @@ -387,7 +309,7 @@ public class ShowConfigAction extends AbstractAction { protected ConfigUIModelBuilder addSpeciesListOption(ObserveSwingApplicationConfigOption option) { return addOption(option).setOptionEditor(speciesListTableCellEditor) - .setOptionRenderer(speciesListsTableCellRenderer); + .setOptionRenderer(speciesListsTableCellRenderer); } diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index 7bd0517..3e25992 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -519,30 +519,20 @@ observe.common.well=Well observe.common.wind=Wind observe.common.wormsId=Worms id observe.common.yearService=Year service -observe.config.category.changeStorage=Data sources -observe.config.category.changeStorage.description=To change Data sources -observe.config.category.directories=Directories -observe.config.category.directories.description=Directories used by application -observe.config.category.gps=GPS -observe.config.category.gps.description=GPS Configuration -observe.config.category.h2=Local data source -observe.config.category.h2.description=Configuration of local data source -observe.config.category.map=Map -observe.config.category.map.description=Configure layers of maps +observe.config.category.application=Application +observe.config.category.application.description=Application options +observe.config.category.expert=Expert +observe.config.category.expert.description=Export mode options observe.config.category.observation=Qualification of observations observe.config.category.observation.description=Qualification of observations -observe.config.category.obstuna=Remote data source -observe.config.category.obstuna.description=Configuration of remote data source -observe.config.category.other=Other... -observe.config.category.other.description=Other properties observe.config.category.speciesList.longline=Species lists for longline observe.config.category.speciesList.longline.description=Species lists for longline observe.config.category.speciesList.seine=Species lists for seine observe.config.category.speciesList.seine.description=Species lists for seine -observe.config.category.synchro=Admin Tasks -observe.config.category.synchro.description=Administrations tasks to perform on data sources -observe.config.category.validation=Validation -observe.config.category.validation.description=Validation options +observe.config.category.technical=Technical +observe.config.category.technical.description=Technical informations +observe.config.category.ui=GUI +observe.config.category.ui.description=Graphical interface options observe.content.action.activity=Create a new activity observe.content.action.activity.tip=Create a new activity observe.content.action.closeAndCreate=Close and create diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 5f4eb8f..6cc2b9b 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -519,30 +519,20 @@ observe.common.well=Cuba observe.common.wind=Fuerza del viento observe.common.wormsId=Worms observe.common.yearService=año de entrada en servicio -observe.config.category.changeStorage=Fuente de datos -observe.config.category.changeStorage.description=Opciones de cambio de la fuente de datos -observe.config.category.directories=Directorios -observe.config.category.directories.description=Directorios de la aplicación -observe.config.category.gps=GPS -observe.config.category.gps.description=Configuración GPS -observe.config.category.h2=Base local -observe.config.category.h2.description=Configuración de la base locale -observe.config.category.map=Mapa -observe.config.category.map.description=Configuración de los fondos a usar para los mapas +observe.config.category.application=Application \#TODO +observe.config.category.application.description=Application options \#TODO +observe.config.category.expert=Expert \#TODO +observe.config.category.expert.description=Expert mode \#TODO observe.config.category.observation=Calificación de las observaciones observe.config.category.observation.description=Gestion de los indicadores de calificación de los programas -observe.config.category.obstuna=Base remota -observe.config.category.obstuna.description=Configuración de la base remota -observe.config.category.other=Otro -observe.config.category.other.description=Otras opciones observe.config.category.speciesList.longline=Configuración de las listas de especies (Palangre) observe.config.category.speciesList.longline.description=Elegir las listas de especies a utilizar en los formularios de una marea de tipo palengre observe.config.category.speciesList.seine=Configuración de las listas de especies (Pesca al cerco) observe.config.category.speciesList.seine.description=Elegir las listas de especies a utilizar en los formularios de una marea de tipo pesca al cerco -observe.config.category.synchro=Acciones sobre la base -observe.config.category.synchro.description=Configuración de acciones sobre la base -observe.config.category.validation=Validation -observe.config.category.validation.description=Validation optionsTODO +observe.config.category.technical=Technical \#TODO +observe.config.category.technical.description=Technical informations \#TODO +observe.config.category.ui=Otro \#TODO +observe.config.category.ui.description=Otras opciones \#TODO observe.content.action.activity=Crear una nueva actividad observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.closeAndCreate=Cerrar y crear diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index c7d1bea..1f0bd21 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -519,30 +519,20 @@ observe.common.well=Cuve observe.common.wind=Vent Beaufort observe.common.wormsId=Worms observe.common.yearService=Année de mise en service -observe.config.category.changeStorage=Source de données -observe.config.category.changeStorage.description=Options de changement de source de données -observe.config.category.directories=Répertoires -observe.config.category.directories.description=Répertoires de l'application -observe.config.category.gps=GPS -observe.config.category.gps.description=Configuration GPS -observe.config.category.h2=Base locale -observe.config.category.h2.description=Configuration base locale -observe.config.category.map=Carte -observe.config.category.map.description=Configuration des fonds à utiliser pour les cartes +observe.config.category.application=Application +observe.config.category.application.description=Options applicatives +observe.config.category.expert=Avancé +observe.config.category.expert.description=Configuration avancée observe.config.category.observation=Qualification des observations observe.config.category.observation.description=Gestion des indicateurs de qualification des programmes -observe.config.category.obstuna=Base distante -observe.config.category.obstuna.description=Configuration base distante -observe.config.category.other=Autre -observe.config.category.other.description=Autres options observe.config.category.speciesList.longline=Configuration des listes d'espèces (Palangre) observe.config.category.speciesList.longline.description=Choisir les listes d'espèces à utiliser dans les formulaire d'une marée de type palangre observe.config.category.speciesList.seine=Configuration des listes d'espèces (Senne) observe.config.category.speciesList.seine.description=Choisir les listes d'espèces à utiliser dans les formulaire d'une marée de type senne -observe.config.category.synchro=Actions sur base -observe.config.category.synchro.description=Configuration actions sur base -observe.config.category.validation=Validation -observe.config.category.validation.description=Paramétrage de la validation +observe.config.category.technical=Technique +observe.config.category.technical.description=Informations techniques +observe.config.category.ui=Interface graphiques +observe.config.category.ui.description=Configuration des interfaces graphiques observe.content.action.activity=Créer une nouvelle activité observe.content.action.activity.tip=Créer une nouvelle activité pour la route courante observe.content.action.closeAndCreate=Clôturer et créer -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.