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
1 changed file:
Changes:
| ... | ... | @@ -59,11 +59,18 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { |
| 59 | 59 | return;
|
| 60 | 60 | }
|
| 61 | 61 | |
| 62 | - Integer code = Integer.valueOf(ocean.get(ReferentialDtoReference.PROPERTY_CODE));
|
|
| 63 | - boolean valid = code == 3
|
|
| 64 | - || (code == 1 && (quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4))
|
|
| 65 | - || (code == 2 && (quadrant == 1 || quadrant == 2));
|
|
| 66 | - |
|
| 62 | + int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE);
|
|
| 63 | + boolean valid;
|
|
| 64 | + switch (code) {
|
|
| 65 | + case 1: // Atlantic
|
|
| 66 | + valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4;
|
|
| 67 | + break;
|
|
| 68 | + case 2: // Indian
|
|
| 69 | + valid = quadrant == 1 || quadrant == 2;
|
|
| 70 | + break;
|
|
| 71 | + default:
|
|
| 72 | + valid=true;
|
|
| 73 | + }
|
|
| 67 | 74 | if (!valid) {
|
| 68 | 75 | if (getDefaultMessage().isEmpty()) {
|
| 69 | 76 | setDefaultMessage(n("observe.validation.quadrant.invalid") + "##${" + this.ocean + ".label}");
|