# HG changeset patch # User Raimund Renkert # Date 1371035583 -7200 # Node ID 03df43fdd3597160239a69976d4b3269c44ff6d2 # Parent 5abec5413d657028452885155a8e2b3a22ed48d8 Added repository for LOrt and changed member 'ort' to 'ortId' in LOrt. diff -r 5abec5413d65 -r 03df43fdd359 src/main/java/de/intevation/lada/data/LOrtRepository.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/main/java/de/intevation/lada/data/LOrtRepository.java Wed Jun 12 13:13:03 2013 +0200 @@ -0,0 +1,30 @@ +package de.intevation.lada.data; + +import java.util.List; + +import javax.inject.Inject; +import javax.persistence.EntityManager; +import javax.persistence.criteria.CriteriaQuery; + +import de.intevation.lada.model.LOrt; + + +public class LOrtRepository +extends Repository +{ + /** + * The entitymanager managing the data. + */ + @Inject + private EntityManager em; + + /** + * Filter LProbe object list by the given criteria. + * + * @param criteria + * @return List of LProbe objects. + */ + public List filter(CriteriaQuery criteria) { + return em.createQuery(criteria).getResultList(); + } +} diff -r 5abec5413d65 -r 03df43fdd359 src/main/java/de/intevation/lada/model/LOrt.java --- a/src/main/java/de/intevation/lada/model/LOrt.java Wed Jun 12 11:07:16 2013 +0200 +++ b/src/main/java/de/intevation/lada/model/LOrt.java Wed Jun 12 13:13:03 2013 +0200 @@ -21,7 +21,7 @@ public class LOrt implements java.io.Serializable { private int POrtId; - private Ort ort; + private Long ortId; private String probeId; private String ortsTyp; private String ortszusatztext; @@ -30,16 +30,16 @@ public LOrt() { } - public LOrt(int POrtId, Ort ort, String probeId) { + public LOrt(int POrtId, Long ortId, String probeId) { this.POrtId = POrtId; - this.ort = ort; + this.ortId = ortId; this.probeId = probeId; } - public LOrt(int POrtId, Ort ort, String probeId, String ortsTyp, + public LOrt(int POrtId, Long ortId, String probeId, String ortsTyp, String ortszusatztext, Date letzteAenderung) { this.POrtId = POrtId; - this.ort = ort; + this.ortId = ortId; this.probeId = probeId; this.ortsTyp = ortsTyp; this.ortszusatztext = ortszusatztext; @@ -56,14 +56,13 @@ this.POrtId = POrtId; } - @ManyToOne(fetch = FetchType.EAGER) @JoinColumn(name = "ort_id", nullable = false) - public Ort getOrt() { - return this.ort; + public Long getOrt() { + return this.ortId; } - public void setOrt(Ort ort) { - this.ort = ort; + public void setOrt(Long ortId) { + this.ortId = ortId; } @Column(name = "probe_id", nullable = false)