branch develop updated (fb99f0e -> 3aea7d8)
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 fb99f0e Clean code new 34c54e4 Tri des listes de référence selon le code si possible (See #8538) new ff8b4e7 Specialize trads (See #8538) new d94c4e5 Tri des listes de référence aussi dans les autres cas via decorateur (See #8538) new 3aea7d8 Fixes #8538 Merge branch 'feature/8538' into develop The 4 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 3aea7d8d0bb7dd406b3924752c57286f1dbe272a Merge: fb99f0e d94c4e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 17:21:32 2016 +0200 Fixes #8538 Merge branch 'feature/8538' into develop commit d94c4e5f9d41c098904e9b063e5a6edb1f10b5bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 17:20:15 2016 +0200 Tri des listes de référence aussi dans les autres cas via decorateur (See #8538) commit ff8b4e7a5a369df6e2899592600086493e3c9288 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 17:19:12 2016 +0200 Specialize trads (See #8538) commit 34c54e4371eed913ee2b94210c1f3517a6c1b1cb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 16:47:40 2016 +0200 Tri des listes de référence selon le code si possible (See #8538) Summary of changes: .../application-swing-decoration_en_GB.properties | 8 +-- .../application-swing-decoration_es_ES.properties | 8 +-- .../application-swing-decoration_fr_FR.properties | 8 +-- .../ReferentialSynchronizeTreeModelsBuilder.java | 61 ++++++++++++++++++---- .../dto/referential/ReferentialReference.java | 4 ++ 5 files changed, 68 insertions(+), 21 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 34c54e4371eed913ee2b94210c1f3517a6c1b1cb Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 16:47:40 2016 +0200 Tri des listes de référence selon le code si possible (See #8538) --- .../ReferentialSynchronizeTreeModelsBuilder.java | 40 +++++++++++++++++----- .../dto/referential/ReferentialReference.java | 4 +++ 2 files changed, 35 insertions(+), 9 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java index aa6ad7b..a809c43 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java @@ -37,8 +37,13 @@ import fr.ird.observe.services.service.actions.synchro.referential.diff.Referent import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffState; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffs; import fr.ird.observe.services.service.actions.synchro.referential.diff.ReferentialSynchronizeDiffsEngine; +import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.tuple.Pair; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Comparator; +import java.util.List; import java.util.Objects; import java.util.Optional; @@ -121,21 +126,22 @@ public class ReferentialSynchronizeTreeModelsBuilder { private <R extends ReferentialDto> void addFromLeft(RootReferentialSynchroNode rootNode, ImmutableSet<ReferentialSynchronizeDiffState> diffStates, Class<R> referentialName, CreateNode createNode) { ReferentialReferenceSet<R> referenceSet = engine.getLeftReferentialReferenceSet(referentialName, diffStates); - ImmutableSet<ReferentialReference<R>> references = referenceSet.getReferences(); - if (!references.isEmpty()) { - TypeReferentialSynchroNode typeNode = rootNode.getOrAddTypeNode(referentialName); - for (ReferentialReference<R> reference : references) { - createNode.createNode(typeNode, reference); - } - - } + add0(rootNode, referenceSet, referentialName, createNode); } private <R extends ReferentialDto> void addFromRight(RootReferentialSynchroNode rootNode, ImmutableSet<ReferentialSynchronizeDiffState> diffStates, Class<R> referentialName, CreateNode createNode) { ReferentialReferenceSet<R> referenceSet = engine.getRightReferentialReferenceSet(referentialName, diffStates); - ImmutableSet<ReferentialReference<R>> references = referenceSet.getReferences(); + add0(rootNode, referenceSet, referentialName, createNode); + } + + private <R extends ReferentialDto> void add0(RootReferentialSynchroNode rootNode, ReferentialReferenceSet<R> referenceSet, Class<R> referentialName, CreateNode createNode) { + + List<ReferentialReference<R>> references = new ArrayList<>(referenceSet.getReferences()); if (!references.isEmpty()) { TypeReferentialSynchroNode typeNode = rootNode.getOrAddTypeNode(referentialName); + if (references.get(0).getPropertyNames().contains(ReferentialDto.PROPERTY_CODE)) { + Collections.sort(references, new ReferentialReferenceComparator<>()); + } for (ReferentialReference<R> reference : references) { createNode.createNode(typeNode, reference); } @@ -190,4 +196,20 @@ public class ReferentialSynchronizeTreeModelsBuilder { typeNode.add(node); } } + + private static class ReferentialReferenceComparator<R extends ReferentialDto> implements Comparator<ReferentialReference<R>> { + + @Override + public int compare(ReferentialReference<R> o1, ReferentialReference<R> o2) { + String o1Code = o1.getCode(); + String o2Code = o2.getCode(); + if (o1Code == null) { + return o2Code == null ? 0 : -1; + } + if (o2Code == null) { + return 1; + } + return StringUtils.leftPad(o1Code, 6, "0").compareTo(StringUtils.leftPad(o2Code, 6, "0")); + } + } } diff --git a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java index ba1dc77..547180f 100644 --- a/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java +++ b/services-dto/src/main/java/fr/ird/observe/services/dto/referential/ReferentialReference.java @@ -79,6 +79,10 @@ public class ReferentialReference<D extends ReferentialDto> extends AbstractRefe this.enabled = enabled; } + public String getCode() { + return (String) getPropertyValue(ReferentialDto.PROPERTY_CODE); + } + @Override public String toString() { MoreObjects.ToStringHelper toStringHelper = MoreObjects.toStringHelper(this) -- 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 ff8b4e7a5a369df6e2899592600086493e3c9288 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 17:19:12 2016 +0200 Specialize trads (See #8538) --- .../resources/i18n/application-swing-decoration_en_GB.properties | 8 ++++---- .../resources/i18n/application-swing-decoration_es_ES.properties | 8 ++++---- .../resources/i18n/application-swing-decoration_fr_FR.properties | 8 ++++---- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties index 156bf6f..bcd9f8c 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_en_GB.properties @@ -250,10 +250,10 @@ observe.type.tripSeines=Trips observe.type.tripType=Trip type observe.type.tripTypes=Trips type observe.type.vessel=Vessel -observe.type.vesselActivityLongline=Vessel activity -observe.type.vesselActivityLonglines=Vessels activity -observe.type.vesselActivitySeine=Vessel activity -observe.type.vesselActivitySeines=Vessels activity +observe.type.vesselActivityLongline=Vessel activity (Longline) +observe.type.vesselActivityLonglines=Vessels activity (Longline) +observe.type.vesselActivitySeine=Vessel activity (Seine) +observe.type.vesselActivitySeines=Vessels activity (Seine) observe.type.vesselSizeCategories=Vessels size category observe.type.vesselSizeCategory=Vessel size category observe.type.vesselType=Vessel type diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties index 3623ac0..209d731 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_es_ES.properties @@ -250,10 +250,10 @@ observe.type.tripSeines=Mareas observe.type.tripType=Tipo de marea observe.type.tripTypes=Tipos de marea observe.type.vessel=Buque -observe.type.vesselActivityLongline=Actividad buque -observe.type.vesselActivityLonglines=Actividades buque -observe.type.vesselActivitySeine=Actividad buque -observe.type.vesselActivitySeines=Actividades buque +observe.type.vesselActivityLongline=Actividad buque \#TODO-SP +observe.type.vesselActivityLonglines=Actividades buque \#TODO-SP +observe.type.vesselActivitySeine=Actividad buque \#TODO-SP +observe.type.vesselActivitySeines=Actividades buque \#TODO-SP observe.type.vesselSizeCategories=Categorías de buque observe.type.vesselSizeCategory=Categoría de buque observe.type.vesselType=Tipo de pesquería diff --git a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties index 218a068..e0071fb 100644 --- a/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties +++ b/application-swing-decoration/src/main/resources/i18n/application-swing-decoration_fr_FR.properties @@ -250,10 +250,10 @@ observe.type.tripSeines=Marées observe.type.tripType=Type de marée observe.type.tripTypes=Types de marée observe.type.vessel=Bateau -observe.type.vesselActivityLongline=Activité bateau -observe.type.vesselActivityLonglines=Activités bateau -observe.type.vesselActivitySeine=Activité bateau -observe.type.vesselActivitySeines=Activités bateau +observe.type.vesselActivityLongline=Activité bateau (Palangre) +observe.type.vesselActivityLonglines=Activités bateau (Palangre) +observe.type.vesselActivitySeine=Activité bateau (Senne) +observe.type.vesselActivitySeines=Activités bateau (Senne) observe.type.vesselSizeCategories=Catégories de bateau observe.type.vesselSizeCategory=Catégorie de bateau observe.type.vesselType=Type de pêcherie -- 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 d94c4e5f9d41c098904e9b063e5a6edb1f10b5bc Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 17:20:15 2016 +0200 Tri des listes de référence aussi dans les autres cas via decorateur (See #8538) --- .../ReferentialSynchronizeTreeModelsBuilder.java | 25 ++++++++++++++++++++-- 1 file changed, 23 insertions(+), 2 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java index a809c43..2bbb0c4 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/tree/ReferentialSynchronizeTreeModelsBuilder.java @@ -24,6 +24,9 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tre import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSetMultimap; +import fr.ird.observe.application.swing.ObserveSwingApplicationContext; +import fr.ird.observe.application.swing.decoration.DecoratorService; +import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ReferentialSynchronizeMode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.AddedReferenceReferentialSynchroNode; import fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng.tree.node.ReferenceReferentialSynchroNodeSupport; @@ -140,7 +143,11 @@ public class ReferentialSynchronizeTreeModelsBuilder { if (!references.isEmpty()) { TypeReferentialSynchroNode typeNode = rootNode.getOrAddTypeNode(referentialName); if (references.get(0).getPropertyNames().contains(ReferentialDto.PROPERTY_CODE)) { - Collections.sort(references, new ReferentialReferenceComparator<>()); + Collections.sort(references, new ReferentialReferenceComparatorFromCode<>()); + } else { + DecoratorService decoratorService = ObserveSwingApplicationContext.get().getDecoratorService(); + ReferentialReferenceDecorator<R> decorator = decoratorService.getReferentialReferenceDecorator(referentialName); + Collections.sort(references, new ReferentialReferenceComparatorFromDecorator<>(decorator)); } for (ReferentialReference<R> reference : references) { createNode.createNode(typeNode, reference); @@ -197,7 +204,7 @@ public class ReferentialSynchronizeTreeModelsBuilder { } } - private static class ReferentialReferenceComparator<R extends ReferentialDto> implements Comparator<ReferentialReference<R>> { + private static class ReferentialReferenceComparatorFromCode<R extends ReferentialDto> implements Comparator<ReferentialReference<R>> { @Override public int compare(ReferentialReference<R> o1, ReferentialReference<R> o2) { @@ -212,4 +219,18 @@ public class ReferentialSynchronizeTreeModelsBuilder { return StringUtils.leftPad(o1Code, 6, "0").compareTo(StringUtils.leftPad(o2Code, 6, "0")); } } + + private static class ReferentialReferenceComparatorFromDecorator<R extends ReferentialDto> implements Comparator<ReferentialReference<R>> { + + private final ReferentialReferenceDecorator<R> decorator; + + public ReferentialReferenceComparatorFromDecorator(ReferentialReferenceDecorator<R> decorator) { + this.decorator = decorator; + } + + @Override + public int compare(ReferentialReference<R> o1, ReferentialReference<R> o2) { + return decorator.toString(o1).compareTo(decorator.toString(o2)); + } + } } -- 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 3aea7d8d0bb7dd406b3924752c57286f1dbe272a Merge: fb99f0e d94c4e5 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Sep 10 17:21:32 2016 +0200 Fixes #8538 Merge branch 'feature/8538' into develop .../application-swing-decoration_en_GB.properties | 8 +-- .../application-swing-decoration_es_ES.properties | 8 +-- .../application-swing-decoration_fr_FR.properties | 8 +-- .../ReferentialSynchronizeTreeModelsBuilder.java | 61 ++++++++++++++++++---- .../dto/referential/ReferentialReference.java | 4 ++ 5 files changed, 68 insertions(+), 21 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm