Mercurial > lada > lada-server
changeset 732:83acc3b63354
Fixed size of main descriptor fields and return 'null' instead of "" for empty
Umwelt in factory.
| author | Raimund Renkert <raimund.renkert@intevation.de> |
|---|---|
| date | Mon, 14 Sep 2015 10:30:44 +0200 |
| parents | a7bbe9762749 |
| children | d7c0b950c1ce |
| files | src/main/java/de/intevation/lada/factory/ProbeFactory.java src/main/java/de/intevation/lada/validation/rules/probe/DeskriptorToUmwelt.java |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/factory/ProbeFactory.java Fri Sep 11 14:54:14 2015 +0200 +++ b/src/main/java/de/intevation/lada/factory/ProbeFactory.java Mon Sep 14 10:30:44 2015 +0200 @@ -439,9 +439,9 @@ return ""; } - int size = 1; + int size = 2; if (isZebs) { - size = 2; + size = 3; } for (int i = size; i >= 0; i--) { if (media.get(i) == -1) { @@ -454,7 +454,7 @@ @SuppressWarnings("unchecked") List<DeskriptorUmwelt> data = (List<DeskriptorUmwelt>)response.getData(); if (data.isEmpty()) { - return ""; + return null; } boolean unique = isUnique(data); @@ -511,7 +511,7 @@ return data.get(found).getUmwId(); } } - return ""; + return null; } }
--- a/src/main/java/de/intevation/lada/validation/rules/probe/DeskriptorToUmwelt.java Fri Sep 11 14:54:14 2015 +0200 +++ b/src/main/java/de/intevation/lada/validation/rules/probe/DeskriptorToUmwelt.java Mon Sep 14 10:30:44 2015 +0200 @@ -108,9 +108,9 @@ return violation; } - int size = 3; + int size = 2; if (isZebs) { - size = 1; + size = 3; } for (int i = size; i >= 0; i--) { if (media.get(i) == -1) {