Mercurial > lada > lada-server
diff src/main/java/de/intevation/lada/validation/rules/probe/DeskriptorToUmwelt.java @ 1097:186d602e031a
Merged branch schema-update into default.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Fri, 14 Oct 2016 18:17:42 +0200 |
parents | bcaf30a871ef |
children | 18c789672b14 |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/validation/rules/probe/DeskriptorToUmwelt.java Fri Oct 14 16:11:22 2016 +0200 +++ b/src/main/java/de/intevation/lada/validation/rules/probe/DeskriptorToUmwelt.java Fri Oct 14 18:17:42 2016 +0200 @@ -12,9 +12,9 @@ import javax.inject.Inject; -import de.intevation.lada.model.land.LProbe; -import de.intevation.lada.model.stamm.DeskriptorUmwelt; -import de.intevation.lada.model.stamm.Deskriptoren; +import de.intevation.lada.model.land.Probe; +import de.intevation.lada.model.stammdaten.DeskriptorUmwelt; +import de.intevation.lada.model.stammdaten.Deskriptoren; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; import de.intevation.lada.util.data.Repository; @@ -39,7 +39,7 @@ @Override public Violation execute(Object object) { - LProbe probe = (LProbe)object; + Probe probe = (Probe)object; if (probe.getMediaDesk() == null || probe.getMediaDesk().equals("")) { return null; } @@ -204,12 +204,6 @@ else found = false; break; - case 12: if (data.get(i).getS12() == null || - data.get(i).getS12().equals(media.get(12))) - found = true; - else - found = false; - break; } if (found) { return null;