Mercurial > dive4elements > river
diff flys-backend/src/main/java/de/intevation/flys/model/MeasurementStation.java @ 5379:61bf64b102bc mapgenfix
Merge with default branch
author | Christian Lins <christian.lins@intevation.de> |
---|---|
date | Fri, 22 Mar 2013 11:25:54 +0100 |
parents | 8667f629d238 |
children | 1cc82e328658 |
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/model/MeasurementStation.java Wed Mar 06 14:14:15 2013 +0100 +++ b/flys-backend/src/main/java/de/intevation/flys/model/MeasurementStation.java Fri Mar 22 11:25:54 2013 +0100 @@ -21,7 +21,7 @@ private String measurementType; private String riverside; private String operator; - private String comment; + private String description; private Double station; private Range range; @@ -37,7 +37,7 @@ public MeasurementStation(River river, String name, String measurementType, String riverside, Double station, Range range, Gauge gauge, - TimeInterval observationTimerange, String operator, String comment) { + TimeInterval observationTimerange, String operator, String description) { this.river = river; this.name = name; this.measurementType = measurementType; @@ -47,7 +47,7 @@ this.gauge = gauge; this.observationTimerange = observationTimerange; this.operator = operator; - this.comment = comment; + this.description = description; } @Id @@ -147,13 +147,13 @@ this.operator = operator; } - @Column(name = "comment") - public String getComment() { - return comment; + @Column(name = "description") + public String getDescription() { + return description; } - public void setComment(String comment) { - this.comment = comment; + public void setDescription(String description) { + this.description = description; } }