branch develop updated (84aaeac -> 8df17ed)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository observe. See http://git.codelutin.com/observe.git from 84aaeac fixes #7043: [ObserveLL] libellé position verticale d'un tdr Merge branch 'feature/7043' into develop new 8ee21b6 suppression du controle entre section sur la longeur d'orin (refs #7044) new 8df17ed fixes #7044: [ObserveLL] Contrôle abusif longueur orin entre sections Merge branch 'feature/7044' into develop 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 8df17ed062bf831d5d4b3e5eabacaf0f3f6e55ea Merge: 84aaeac 8ee21b6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 14:12:05 2015 +0200 fixes #7044: [ObserveLL] Contrôle abusif longueur orin entre sections Merge branch 'feature/7044' into develop commit 8ee21b6e17fe5ab74185cb512153672fe2172061 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 14:12:02 2015 +0200 suppression du controle entre section sur la longeur d'orin (refs #7044) Summary of changes: ...onglineDetailCompositionUIValidationHelper.java | 22 ---------------------- .../resources/i18n/observe-swing_en_GB.properties | 1 - .../resources/i18n/observe-swing_es_ES.properties | 1 - .../resources/i18n/observe-swing_fr_FR.properties | 1 - 4 files changed, 25 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8ee21b6e17fe5ab74185cb512153672fe2172061 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 14:12:02 2015 +0200 suppression du controle entre section sur la longeur d'orin (refs #7044) --- ...onglineDetailCompositionUIValidationHelper.java | 22 ---------------------- .../resources/i18n/observe-swing_en_GB.properties | 1 - .../resources/i18n/observe-swing_es_ES.properties | 1 - .../resources/i18n/observe-swing_fr_FR.properties | 1 - 4 files changed, 25 deletions(-) diff --git a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java index f36afb6..edb6152 100644 --- a/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java +++ b/observe-swing/src/main/java/fr/ird/observe/ui/content/impl/longline/LonglineDetailCompositionUIValidationHelper.java @@ -30,7 +30,6 @@ import fr.ird.observe.entities.longline.Basket; import fr.ird.observe.entities.longline.Branchline; import fr.ird.observe.entities.longline.Section; import fr.ird.observe.entities.longline.SectionWithTemplate; -import fr.ird.observe.entities.longline.Sections; import fr.ird.observe.ui.util.ObserveSwingValidatorMessageTableModel; import jaxx.runtime.validator.swing.SwingValidator; import jaxx.runtime.validator.swing.SwingValidatorMessage; @@ -207,31 +206,10 @@ public class LonglineDetailCompositionUIValidationHelper { try { - Section previousSection = null; - for (Section section : sections) { - if (previousSection != null) { - - // validate previousSection.lastBasket.floatline2Length = section.firstBasket.floatline1Length - Basket lastBasket = Sections.getLastBasket(previousSection); - Basket firstBasket = Sections.getFirstBasket(section); - - Float previousBasketFloatline2Length = lastBasket == null ? null : lastBasket.getFloatline2Length(); - Float basketFloatline1Length = firstBasket == null ? null : firstBasket.getFloatline1Length(); - - if (previousBasketFloatline2Length != null - && basketFloatline1Length != null - && Math.abs(previousBasketFloatline2Length - basketFloatline1Length) > 0.001f) { - - validationContext.addMessage(sectionValidator, NuitonValidatorScope.ERROR, "floatline2Length", t("observe.section.invalid.nextFloatline1Length", previousBasketFloatline2Length, basketFloatline1Length)); - - } - } validateSection(validationContext, section); - previousSection = section; - } } finally { diff --git a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties index af6200b..4fd688b 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_en_GB.properties @@ -1482,7 +1482,6 @@ observe.schoolEstimate.table.weight= observe.schoolEstimate.table.weight.tip= observe.section.cant.delete.message=The current section can not be deleted since it used by other data. observe.section.cant.delete.title=Can't delete section -observe.section.invalid.nextFloatline1Length= observe.sectionTemplate.delete.message=Confirm to delete current template. observe.sections.delete.message=Confirm to delete all sections. observe.security.referentiel= diff --git a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties index 1807b53..94cf193 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_es_ES.properties @@ -1484,7 +1484,6 @@ observe.schoolEstimate.table.weight=Peso (en t) observe.schoolEstimate.table.weight.tip=Peso (en t) observe.section.cant.delete.message= observe.section.cant.delete.title= -observe.section.invalid.nextFloatline1Length= observe.sectionTemplate.delete.message= observe.sections.delete.message= observe.security.referentiel=Referencial diff --git a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties index a63c336..9be0e9b 100644 --- a/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties +++ b/observe-swing/src/main/resources/i18n/observe-swing_fr_FR.properties @@ -1473,7 +1473,6 @@ observe.schoolEstimate.table.weight=Poids (en t) observe.schoolEstimate.table.weight.tip=Poids (en t) observe.section.cant.delete.message=La section ne peut pas être supprimée car elle est utilisée dans des données. observe.section.cant.delete.title=Impossible de supprimer la section -observe.section.invalid.nextFloatline1Length=La longueur d'orin 2 (%s) n'est pas égale à la longueur d'orin 1 du premier panier de la section suivante (%s) observe.sectionTemplate.delete.message=Confirmer la suppression de la template sélectionnée. observe.sections.delete.message=Confirmer la suppression de toutes les sections. observe.security.referentiel=Référentiel -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 8df17ed062bf831d5d4b3e5eabacaf0f3f6e55ea Merge: 84aaeac 8ee21b6 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon May 4 14:12:05 2015 +0200 fixes #7044: [ObserveLL] Contrôle abusif longueur orin entre sections Merge branch 'feature/7044' into develop ...onglineDetailCompositionUIValidationHelper.java | 22 ---------------------- .../resources/i18n/observe-swing_en_GB.properties | 1 - .../resources/i18n/observe-swing_es_ES.properties | 1 - .../resources/i18n/observe-swing_fr_FR.properties | 1 - 4 files changed, 25 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm