# HG changeset patch # User Raimund Renkert # Date 1372682708 -7200 # Node ID 682a3acdae707472f7f7770d3dbf87393697846e # Parent 7f97c469faf0f309b1f66776be61aaf328caa406 Use ort id instead of embedded ort object in LOrt. diff -r 7f97c469faf0 -r 682a3acdae70 src/main/java/de/intevation/lada/model/LOrt.java --- a/src/main/java/de/intevation/lada/model/LOrt.java Mon Jul 01 14:44:29 2013 +0200 +++ b/src/main/java/de/intevation/lada/model/LOrt.java Mon Jul 01 14:45:08 2013 +0200 @@ -21,7 +21,7 @@ public class LOrt implements java.io.Serializable { private int POrtId; - private Ort ort; + private int 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, int 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, int 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; + @Column(name = "ort_id", nullable = false) + public int getOrt() { + return this.ortId; } - public void setOrt(Ort ort) { - this.ort = ort; + public void setOrtId(int ortId) { + this.ortId = ortId; } @Column(name = "probe_id", nullable = false)