Mercurial > lada > lada-server
changeset 212:5b232dab4b50
Renamed lprobeId to probeId in LMessung.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 03 Jul 2013 12:21:20 +0200 |
| parents | 30d2aad7371e |
| children | 8fdb699405aa |
| files | src/main/java/de/intevation/lada/model/LMessung.java src/main/java/de/intevation/lada/rest/LMessungService.java |
| diffstat | 2 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/intevation/lada/model/LMessung.java Wed Jul 03 12:02:57 2013 +0200 +++ b/src/main/java/de/intevation/lada/model/LMessung.java Wed Jul 03 12:21:20 2013 +0200 @@ -26,7 +26,7 @@ public class LMessung implements java.io.Serializable { private LMessungId id; - private String lprobeId; + private String probeId; private String mmtId; private String nebenprobenNr; private Integer messdauer; @@ -38,20 +38,20 @@ public LMessung() { } - public LMessung(LMessungId id, String lprobeId, String mmtId, + public LMessung(LMessungId id, String probeId, String mmtId, boolean fertig, boolean geplant) { this.id = id; - this.lprobeId = lprobeId; + this.probeId = probeId; this.mmtId = mmtId; this.fertig = fertig; this.geplant = geplant; } - public LMessung(LMessungId id, String lprobeId, String mmtId, + public LMessung(LMessungId id, String probeId, String mmtId, String nebenprobenNr, Integer messdauer, Date messzeitpunkt, boolean fertig, Date letzteAenderung, boolean geplant) { this.id = id; - this.lprobeId = lprobeId; + this.probeId = probeId; this.mmtId = mmtId; this.nebenprobenNr = nebenprobenNr; this.messdauer = messdauer; @@ -74,12 +74,12 @@ } @Column(name = "probe_id", nullable = false, insertable = false, updatable = false) - public String getLProbeId() { - return this.lprobeId; + public String getProbeId() { + return this.probeId; } - public void setLProbeId(String lprobeId) { - this.lprobeId = lprobeId; + public void setProbeId(String probeId) { + this.probeId = probeId; } @Column(name = "mmt_id", nullable = false)
--- a/src/main/java/de/intevation/lada/rest/LMessungService.java Wed Jul 03 12:02:57 2013 +0200 +++ b/src/main/java/de/intevation/lada/rest/LMessungService.java Wed Jul 03 12:21:20 2013 +0200 @@ -18,7 +18,6 @@ import de.intevation.lada.authentication.Authentication; import de.intevation.lada.authentication.AuthenticationException; -import de.intevation.lada.authentication.AuthenticationResponse; import de.intevation.lada.data.QueryBuilder; import de.intevation.lada.data.Repository; import de.intevation.lada.model.LMessung; @@ -103,7 +102,7 @@ @Context HttpHeaders headers ) { try { - String probeId = messung.getLProbeId(); + String probeId = messung.getProbeId(); if (authentication.hasAccess(headers, probeId)) { return repository.update(messung); } @@ -129,7 +128,7 @@ @Context HttpHeaders headers ) { try { - String probeId = messung.getLProbeId(); + String probeId = messung.getProbeId(); if (authentication.hasAccess(headers, probeId)) { return repository.create(messung); }