branch develop updated (9094764 -> 8d1761c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git from 9094764 ajout traduction pour le status d'un référentiel dans les écrans d'édition new 4ede04c Bien recharger le modèle des référentiels après modification de celui-ci new 8d1761c Bien renseigné le type de toutes les popups de décoration 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 8d1761c10d899dab9dd6d3024712acb1432cd65a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 19:04:17 2016 +0200 Bien renseigné le type de toutes les popups de décoration commit 4ede04c9799a6ca8eee81f52b803bd4fbb373451 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 18:47:43 2016 +0200 Bien recharger le modèle des référentiels après modification de celui-ci Summary of changes: .../ird/observe/ui/content/ContentUIInitializer.java | 18 +++++++++++++++++- .../ui/content/ref/ContentReferenceUIHandler.java | 17 +++++++++++------ .../i18n/observe-application-swing_en_GB.properties | 3 ++- .../i18n/observe-application-swing_es_ES.properties | 3 ++- .../i18n/observe-application-swing_fr_FR.properties | 3 ++- 5 files changed, 34 insertions(+), 10 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 4ede04c9799a6ca8eee81f52b803bd4fbb373451 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 18:47:43 2016 +0200 Bien recharger le modèle des référentiels après modification de celui-ci --- .../ui/content/ref/ContentReferenceUIHandler.java | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java index 046462d..7e0eacc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ref/ContentReferenceUIHandler.java @@ -85,7 +85,6 @@ import java.util.Collections; import java.util.LinkedList; import java.util.List; import java.util.Locale; -import java.util.Optional; import java.util.Set; import static org.nuiton.i18n.I18n.t; @@ -552,6 +551,14 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content } } + protected void reloadReferentialReferenceSetsInModel(Form<E> form) { + + loadReferentialReferenceSetsInModel(form); + + updateReferentialBeanListHeader(getModel().getBeanType(), getUi().getReferentialListHeader()); + + } + @Override protected void prepareValidationContext() { super.prepareValidationContext(); @@ -779,11 +786,9 @@ public class ContentReferenceUIHandler<E extends ReferentialDto> extends Content treeHelper.removeProgram(bean.getId()); } - Optional<ReferentialReference<ReferentialDto>> referenceToDelete = getModel().tryGetReferentialReferenceById("referentialListHeader", bean.getId()); - List<ReferentialReference<E>> references = new ArrayList<>(getModel().getReferentialReferences("referentialListHeader")); - references.remove(referenceToDelete.get()); - //FIXME La liste ne se rafraichit pas bien - getUi().getReferentialListHeader().setData(references); + // on met a jour le referentiel dans le cache et le model + ReferenceSetRequestDefinitions requestDefinition = ReferenceSetRequestDefinitions.get(getBeanType()); + loadReferentialReferenceSetsInModel(requestDefinition.name()); //getModel().setSelectedBean(null); super.afterDelete(); -- 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 observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 8d1761c10d899dab9dd6d3024712acb1432cd65a Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Aug 22 19:04:17 2016 +0200 Bien renseigné le type de toutes les popups de décoration --- .../ird/observe/ui/content/ContentUIInitializer.java | 18 +++++++++++++++++- .../i18n/observe-application-swing_en_GB.properties | 3 ++- .../i18n/observe-application-swing_es_ES.properties | 3 ++- .../i18n/observe-application-swing_fr_FR.properties | 3 ++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java index 245bdb0..b0c0735 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/content/ContentUIInitializer.java @@ -605,6 +605,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E log.debug("Will use decorator " + decorator); } + String entityLabel = t(DecoratorService.getEntityLabel(dtoClass)); + list.getPopupSortLabel().setText(t("observe.content.type.data", entityLabel)); + list.putClientProperty("decorator", decorator); list.init(decorator, new ArrayList<>(), new ArrayList<>()); @@ -631,6 +634,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E log.debug("Will use decorator " + decorator); } + String entityLabel = t(DecoratorService.getEntityLabel(dtoClass)); + list.getPopupSortLabel().setText(t("observe.content.type.referential", entityLabel)); + list.putClientProperty("decorator", decorator); list.init(decorator, new ArrayList<>(), new ArrayList<>()); @@ -657,6 +663,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E log.debug("Will use decorator " + decorator); } + String entityLabel = t(DecoratorService.getEntityLabel(dtoClass)); + list.setPopupTitleText(t("observe.content.type.data", entityLabel)); + list.putClientProperty("decorator", decorator); list.init(decorator, Collections.emptyList()); @@ -681,6 +690,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E log.debug("Will use decorator " + decorator); } + String entityLabel = t(DecoratorService.getEntityLabel(dtoClass)); + list.setPopupTitleText(t("observe.content.type.referential", entityLabel)); + list.putClientProperty("decorator", decorator); list.init(decorator, Collections.emptyList()); @@ -701,6 +713,9 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E DataReferenceDecorator<D> decorator = decoratorService.getDataReferenceDecorator(dtoClass); + String entityLabel = t(DecoratorService.getEntityLabel(dtoClass)); + comboBox.setPopupTitleText(t("observe.content.type.data", entityLabel)); + comboBox.init(decorator, Collections.emptyList()); JComboBox<DataReference<D>> combobox = comboBox.getCombobox(); @@ -724,7 +739,8 @@ public class ContentUIInitializer<E extends IdDto, UI extends ObserveContentUI<E ReferentialReferenceDecorator<D> decorator = decoratorService.getReferentialReferenceDecorator(dtoClass); String entityLabel = t(DecoratorService.getEntityLabel(dtoClass)); - comboBox.setPopupTitleText(t("observe.content.referentialType", entityLabel)); + comboBox.setPopupTitleText(t("observe.content.type.referential", entityLabel)); + comboBox.init(decorator, Collections.emptyList()); JComboBox<ReferentialReference<D>> combobox = comboBox.getCombobox(); 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 5518f59..3111fb6 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 @@ -1493,7 +1493,6 @@ observe.content.objectObservedSpecies.table.speciesStatus.tip= observe.content.person.country=Nationality observe.content.program.tab.general=General caracteristics observe.content.program.tab.observations=Observations -observe.content.referentialType= observe.content.route.message.active.found= observe.content.route.message.active.found.for.other.trip= observe.content.route.message.creating= @@ -1800,6 +1799,8 @@ observe.content.tripSeine.message.updating=Updating a trip observe.content.tripSeine.tab.general=Caracteristics observe.content.tripSeine.tab.map=Map observe.content.tripSeine.title=Trip +observe.content.type.data= +observe.content.type.referential= observe.content.vessel.tab.general=General caracteristics observe.content.vessel.tab.other=Other caracteristics observe.content.weightMeasure.delete.message=Confirm to delete current weight measure. 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 1c47f5d..d52541b 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 @@ -1493,7 +1493,6 @@ observe.content.objectObservedSpecies.table.speciesStatus.tip=Estado observe.content.person.country=Nacionalidad observe.content.program.tab.general= observe.content.program.tab.observations= -observe.content.referentialType= observe.content.route.message.active.found=Ruta abierta. observe.content.route.message.active.found.for.other.trip=Existe una ruta abierta en otra marea. observe.content.route.message.creating=Ruta en proceso de creación. @@ -1800,6 +1799,8 @@ observe.content.tripSeine.message.updating= observe.content.tripSeine.tab.general= observe.content.tripSeine.tab.map=Mapa observe.content.tripSeine.title= +observe.content.type.data= +observe.content.type.referential= observe.content.vessel.tab.general= observe.content.vessel.tab.other= observe.content.weightMeasure.delete.message= 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 ed1062f..e3ed532 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 @@ -1493,7 +1493,6 @@ observe.content.objectObservedSpecies.table.speciesStatus.tip=Statut Espèce observe.content.person.country=Nationalité observe.content.program.tab.general=Caractértistiques générales observe.content.program.tab.observations=Observations -observe.content.referentialType=<html><body>Référentiel <i>%s</i> observe.content.route.message.active.found=Une route est ouverte. observe.content.route.message.active.found.for.other.trip=Une route ouverte existe dans une autre marée. observe.content.route.message.creating=La route est en cours de création. @@ -1800,6 +1799,8 @@ observe.content.tripSeine.message.updating=La maréee est en cours de modificati observe.content.tripSeine.tab.general=Caractéristiques observe.content.tripSeine.tab.map=Carte observe.content.tripSeine.title=Marée +observe.content.type.data=<html><body>Donnée de type <i>%s</i> +observe.content.type.referential=<html><body>Référentiel de type <i>%s</i> observe.content.vessel.tab.general=Caractéristiques générales observe.content.vessel.tab.other=Autres caractéristiques observe.content.weightMeasure.delete.message=Confirmer la suppression de la mesure du poids sélectionnée. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm