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 009bb7c5fff7401997285cdb828a7cd17d9afe6f Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Aug 23 11:38:40 2016 +0200 Suppression configuration en double --- .../ObserveApplicationConfigProvider.java | 60 ---------------------- .../ObserveSwingApplicationConfigProvider.java | 5 +- .../org.nuiton.config.ApplicationConfigProvider | 2 +- .../observe-application-swing_en_GB.properties | 7 ++- .../observe-application-swing_es_ES.properties | 7 ++- .../observe-application-swing_fr_FR.properties | 7 ++- 6 files changed, 19 insertions(+), 69 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveApplicationConfigProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveApplicationConfigProvider.java deleted file mode 100644 index 3408e52..0000000 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveApplicationConfigProvider.java +++ /dev/null @@ -1,60 +0,0 @@ -/* - * #%L - * ObServe :: Swing - * %% - * Copyright (C) 2008 - 2012 IRD, Codelutin, Tony Chemit - * %% - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU General Public License as - * published by the Free Software Foundation, either version 3 of the - * License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/gpl-3.0.html>. - * #L% - */ -package fr.ird.observe.configuration; - -import fr.ird.observe.ObserveCLAction; -import org.nuiton.config.ApplicationConfigProvider; -import org.nuiton.config.ConfigActionDef; -import org.nuiton.config.ConfigOptionDef; - -import java.util.Locale; - -import static org.nuiton.i18n.I18n.l; - -/** - * Application config provider (for site generation). - * - * @author Tony Chemit - chemit@codelutin.com - * @since 2.5 - */ -public class ObserveApplicationConfigProvider implements ApplicationConfigProvider { - - @Override - public String getName() { - return "observeSwing"; - } - - @Override - public String getDescription(Locale locale) { - return l(locale, "observe.application.config"); - } - - @Override - public ConfigOptionDef[] getOptions() { - return ObserveSwingApplicationConfigOption.values(); - } - - @Override - public ConfigActionDef[] getActions() { - return ObserveCLAction.ActionDefinition.values(); - } -} diff --git a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigProvider.java b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigProvider.java index a963b21..e222258 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigProvider.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/configuration/ObserveSwingApplicationConfigProvider.java @@ -22,6 +22,7 @@ package fr.ird.observe.configuration; * #L% */ +import fr.ird.observe.ObserveCLAction; import org.nuiton.config.ApplicationConfigProvider; import org.nuiton.config.ConfigActionDef; import org.nuiton.config.ConfigOptionDef; @@ -44,7 +45,7 @@ public class ObserveSwingApplicationConfigProvider implements ApplicationConfigP @Override public String getDescription(Locale locale) { - return l(locale, "observe.configuration.description"); + return l(locale, "observe.config.name"); } @Override @@ -54,6 +55,6 @@ public class ObserveSwingApplicationConfigProvider implements ApplicationConfigP @Override public ConfigActionDef[] getActions() { - return new ConfigActionDef[0]; + return ObserveCLAction.ActionDefinition.values(); } } diff --git a/observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider b/observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider index 9b7d106..b6c2e86 100644 --- a/observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider +++ b/observe-application-swing/src/main/resources/META-INF/services/org.nuiton.config.ApplicationConfigProvider @@ -1 +1 @@ -fr.ird.observe.configuration.ObserveApplicationConfigProvider \ No newline at end of file +fr.ird.observe.configuration.ObserveSwingApplicationConfigProvider \ No newline at end of file diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties index 14050d2..7ccf536 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_en_GB.properties @@ -340,7 +340,6 @@ observe.admin.resume.operation.failed= observe.admin.resume.operation.need.fix= observe.admin.resume.operation.not.started= observe.admin.resume.operation.running= -observe.application.config=ObServe Configuration observe.catchAcquisitionModeEnum.GROUPED=Batch observe.catchAcquisitionModeEnum.INDIVIDUAL=Individual observe.choice.cancel=Cancel @@ -603,6 +602,7 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= +observe.config.name= observe.config.observation.activitysDetaillees= observe.config.observation.fauneAssociee= observe.config.observation.floatingObject= @@ -639,7 +639,6 @@ observe.config.ui.showNumberEditorButton=Flag sets to true to show button to inv observe.config.ui.showTimeEditorSlider=Show timer slider observe.config.ui.storeRemoteStorage=Flag sets to true to store in config a remote connexion (except passwords) observe.config.ui.treeOpenNodes= -observe.configuration.description= observe.content.action.activity=Create a new activity observe.content.action.activity.tip=Create a new activity observe.content.action.baitHaulingStatus.create.tip= @@ -2117,6 +2116,10 @@ observe.title.storage.info=Storage details observe.title.technical.informations=Technical information of %1$s observe.title.unique.key=Unique keys used in a referentiel observe.title.welcome.admin=Observe Admin +observe.tree.action.collapseAll.tip= +observe.tree.action.expandAll.tip= +observe.tree.action.selectAll.tip= +observe.tree.action.unselectAll.tip= observe.tree.activityLongline=Activity observe.tree.activityLongline.unsaved=New activity observe.tree.activitySeine=Activity diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties index bb7e187..35fc99f 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_es_ES.properties @@ -340,7 +340,6 @@ observe.admin.resume.operation.failed=la operación no realizada observe.admin.resume.operation.need.fix=la operación nesista correcciones observe.admin.resume.operation.not.started=operación no empezada observe.admin.resume.operation.running=operación en curso... -observe.application.config=Configuración de ObServe observe.catchAcquisitionModeEnum.GROUPED= observe.catchAcquisitionModeEnum.INDIVIDUAL= observe.choice.cancel=Cancelar @@ -603,6 +602,7 @@ observe.config.map.layer7.description= observe.config.map.layer8.description= observe.config.map.layer9.description= observe.config.map.style.description= +observe.config.name= observe.config.observation.activitysDetaillees=Observación de actividades detalladas observe.config.observation.fauneAssociee=Observación de Fauna asociada observe.config.observation.floatingObject=Observación de objetos flotantes @@ -639,7 +639,6 @@ observe.config.ui.showNumberEditorButton=Para mostrar el botón que permite usar observe.config.ui.showTimeEditorSlider= observe.config.ui.storeRemoteStorage=Para activar la copia de seguridad de la configuración del origen de datos remota observe.config.ui.treeOpenNodes= -observe.configuration.description= observe.content.action.activity=Crear una nueva actividad observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.baitHaulingStatus.create.tip= @@ -2117,6 +2116,10 @@ observe.title.storage.info= observe.title.technical.informations= observe.title.unique.key= observe.title.welcome.admin= +observe.tree.action.collapseAll.tip= +observe.tree.action.expandAll.tip= +observe.tree.action.selectAll.tip= +observe.tree.action.unselectAll.tip= observe.tree.activityLongline=Actividad observe.tree.activityLongline.unsaved=Nueva actividad observe.tree.activitySeine=Actividad diff --git a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties index e880198..5348eda 100644 --- a/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties +++ b/observe-application-swing/src/main/resources/i18n/observe-application-swing_fr_FR.properties @@ -340,7 +340,6 @@ observe.admin.resume.operation.failed=opération échouée observe.admin.resume.operation.need.fix=opération nécessitant des corrections observe.admin.resume.operation.not.started=opération non démarrée observe.admin.resume.operation.running=opération en cours... -observe.application.config=configuration d'ObServe observe.catchAcquisitionModeEnum.GROUPED=Groupé observe.catchAcquisitionModeEnum.INDIVIDUAL=Par individu observe.choice.cancel=Annuler @@ -603,6 +602,7 @@ observe.config.map.layer7.description=Fichier (shapeFiles) du septième calque d observe.config.map.layer8.description=Fichier (shapeFiles) du huitième calque de la carte observe.config.map.layer9.description=Fichier (shapeFiles) du neuvième calque de la carte observe.config.map.style.description=Fichier des style à appliquer sur les calques de la carte +observe.config.name=configuration d'ObServe observe.config.observation.activitysDetaillees=Observation des activités détaillées observe.config.observation.fauneAssociee=Observation des Faunes associées observe.config.observation.floatingObject=Observation des objets flottants @@ -639,7 +639,6 @@ observe.config.ui.showNumberEditorButton=Pour afficher le bouton qui permet d'ut observe.config.ui.showTimeEditorSlider=Pour afficher la réglette d'édition des heures observe.config.ui.storeRemoteStorage=Pour activer la sauvegarde de la configuration de la source distante observe.config.ui.treeOpenNodes=Noeuds de l'arbre ouverts lors de la dernière fermeture de la base -observe.configuration.description= 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.baitHaulingStatus.create.tip=Créer un nouveau statut de l'appât au virage @@ -2117,6 +2116,10 @@ observe.title.storage.info=Information sur la source de données observe.title.technical.informations=Informations techniques du référentiel %1$s observe.title.unique.key=Clefs métier du référentiel %1$s observe.title.welcome.admin=Observe Administrateur +observe.tree.action.collapseAll.tip= +observe.tree.action.expandAll.tip= +observe.tree.action.selectAll.tip= +observe.tree.action.unselectAll.tip= observe.tree.activityLongline=Activités observe.tree.activityLongline.unsaved=Nouvelle activité observe.tree.activitySeine=Activités -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.