Tony CHEMIT pushed to branch develop-7.x at ultreiaio / ird-observe
Commits:
-
901e37d3
by Tony Chemit at 2022-05-02T00:56:31+02:00
-
17e92d53
by Tony Chemit at 2022-05-02T01:04:41+02:00
-
90afce3e
by Tony Chemit at 2022-05-02T01:28:10+02:00
-
a586bdca
by Tony Chemit at 2022-05-02T01:28:12+02:00
-
c609ca83
by Tony Chemit at 2022-05-02T01:28:13+02:00
-
9c85af5e
by Tony Chemit at 2022-05-02T01:28:13+02:00
1 changed file:
Changes:
| ... | ... | @@ -49,7 +49,7 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { |
| 49 | 49 | throw new ValidationException("No parameter 'fieldName' filled");
|
| 50 | 50 | }
|
| 51 | 51 | |
| 52 | - ReferentialDtoReference ocean = (ReferentialDtoReference) getFieldValue(this.ocean, object);
|
|
| 52 | + ReferentialDtoReference<?,?> ocean = (ReferentialDtoReference<?, ?>) getFieldValue(this.ocean, object);
|
|
| 53 | 53 | if (ocean == null) {
|
| 54 | 54 | throw new ValidationException("could not find ocean named: " + this.ocean);
|
| 55 | 55 | }
|
| ... | ... | @@ -59,13 +59,13 @@ public class QuadrantFieldDtoValidator extends FieldValidatorSupport { |
| 59 | 59 | return;
|
| 60 | 60 | }
|
| 61 | 61 | |
| 62 | - int code = ocean.get(ReferentialDtoReference.PROPERTY_CODE);
|
|
| 62 | + String code = ocean.get(ReferentialDtoReference.PROPERTY_CODE);
|
|
| 63 | 63 | boolean valid;
|
| 64 | 64 | switch (code) {
|
| 65 | - case 1: // Atlantic
|
|
| 65 | + case "1": // Atlantic
|
|
| 66 | 66 | valid= quadrant == 1 || quadrant == 2 || quadrant == 3 || quadrant == 4;
|
| 67 | 67 | break;
|
| 68 | - case 2: // Indian
|
|
| 68 | + case "2": // Indian
|
|
| 69 | 69 | valid = quadrant == 1 || quadrant == 2;
|
| 70 | 70 | break;
|
| 71 | 71 | default:
|