Mercurial > lada > lada-server
diff src/main/java/de/intevation/lada/validation/rules/status/StatusKombination.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 | 385fab3be7f4 |
children |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/validation/rules/status/StatusKombination.java Fri Oct 14 16:11:22 2016 +0200 +++ b/src/main/java/de/intevation/lada/validation/rules/status/StatusKombination.java Fri Oct 14 18:17:42 2016 +0200 @@ -11,8 +11,10 @@ import javax.inject.Inject; -import de.intevation.lada.model.land.LStatusProtokoll; -import de.intevation.lada.model.stamm.StatusKombi; +import org.apache.log4j.Logger; + +import de.intevation.lada.model.land.StatusProtokoll; +import de.intevation.lada.model.stammdaten.StatusKombi; import de.intevation.lada.util.annotation.RepositoryConfig; import de.intevation.lada.util.data.QueryBuilder; import de.intevation.lada.util.data.Repository; @@ -29,18 +31,19 @@ @ValidationRule("Status") public class StatusKombination implements Rule { + @Inject Logger logger; + @Inject @RepositoryConfig(type=RepositoryType.RO) private Repository repository; @Override public Violation execute(Object object) { - LStatusProtokoll status = (LStatusProtokoll)object; + StatusProtokoll status = (StatusProtokoll)object; QueryBuilder<StatusKombi> kombi = new QueryBuilder<StatusKombi>( repository.entityManager("stamm"), StatusKombi.class); - kombi.and("stufeId", status.getStatusStufe()); - kombi.and("wertId", status.getStatusWert()); + kombi.and("id", status.getStatusKombi()); List<StatusKombi> result = repository.filterPlain(kombi.getQuery(), "stamm"); if (result.isEmpty()) {