Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe Commits: 9bb92985 by Tony Chemit at 2022-05-02T00:45:01+02:00 Problème de quadrant - See #2300 - - - - - 1 changed file: - common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java Changes: ===================================== common-validation/src/main/java/fr/ird/observe/validation/validators/QuadrantFieldDtoValidator.java ===================================== @@ -59,11 +59,18 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { return; } - Integer code = Integer.valueOf(ocean.get(ReferentialDtoReference.PROPERTY_CODE)); - boolean valid = code == 3 - || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4)) - || (code == 2 && (quadrant == 1 || quadrant == 2)); - + int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE); + boolean valid; + switch (code) { + case 1: // Atlantic + valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4; + break; + case 2: // Indian + valid = quadrant == 1 || quadrant == 2; + break; + default: + valid=true; + } if (!valid) { if (getDefaultMessage().isEmpty()) { setDefaultMessage(n("observe.validation.quadrant.invalid") + "##${" + this.ocean + ".label}"); View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9bb92985550ca29ce924c89de2... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/-/commit/9bb92985550ca29ce924c89de2... You're receiving this email because of your account on gitlab.com.