Mercurial > lada > lada-server
changeset 387:768afe4f7941 0.6.1
merged.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 11 Oct 2013 12:04:01 +0200 |
parents | 012f76de0687 (diff) 77b4b85b0134 (current diff) |
children | 404283504686 |
files | |
diffstat | 1 files changed, 3 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/model/LProbeInfoId.java Fri Oct 11 11:45:51 2013 +0200 +++ b/src/main/java/de/intevation/lada/model/LProbeInfoId.java Fri Oct 11 12:04:01 2013 +0200 @@ -11,15 +11,12 @@ { @Column(name = "probe_id", nullable = false) private String probeId; - @Column(name = "nebenproben_nr", nullable = false) - private String nebenprobenNr; public LProbeInfoId() { } - public LProbeInfoId(String probeId, String nebenprobenNr) { + public LProbeInfoId(String probeId) { this.probeId = probeId; - this.nebenprobenNr = nebenprobenNr; } public String getProbeId() { @@ -30,14 +27,6 @@ this.probeId = probeId; } - public String getNebenprobenNr() { - return this.nebenprobenNr; - } - - public void setNebenprobenNr(String nebenprobenNr) { - this.nebenprobenNr = nebenprobenNr; - } - @Override public boolean equals(Object other) { if ((this == other)) @@ -50,8 +39,7 @@ return ((this.getProbeId() == castOther.getProbeId()) || (this .getProbeId() != null && castOther.getProbeId() != null && this - .getProbeId().equals(castOther.getProbeId()))) - && (this.getNebenprobenNr() == castOther.getNebenprobenNr()); + .getProbeId().equals(castOther.getProbeId()))); } @Override @@ -60,7 +48,7 @@ result = 37 * result + (getProbeId() == null ? 0 : this.getProbeId().hashCode()); - result = 37 * result + this.getNebenprobenNr().hashCode(); + result = 37 * result; return result; } }