Mercurial > dive4elements > river

comparison flys-backend/src/main/java/de/intevation/flys/model/MeasurementStation.java @ 5379:61bf64b102bc mapgenfix

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with default branch
author Christian Lins <christian.lins@intevation.de>
date Fri, 22 Mar 2013 11:25:54 +0100
parents 8667f629d238
children 1cc82e328658
comparison
equal deleted inserted replaced
5175:cfc5540a4eec 5379:61bf64b102bc
19 19
20 private String name; 20 private String name;
21 private String measurementType; 21 private String measurementType;
22 private String riverside; 22 private String riverside;
23 private String operator; 23 private String operator;
24 private String comment; 24 private String description;
25 25
26 private Double station; 26 private Double station;
27 private Range range; 27 private Range range;
28 28
29 private River river; 29 private River river;
35 public MeasurementStation() { 35 public MeasurementStation() {
36 } 36 }
37 37
38 public MeasurementStation(River river, String name, String measurementType, 38 public MeasurementStation(River river, String name, String measurementType,
39 String riverside, Double station, Range range, Gauge gauge, 39 String riverside, Double station, Range range, Gauge gauge,
40 TimeInterval observationTimerange, String operator, String comment) { 40 TimeInterval observationTimerange, String operator, String description) {
41 this.river = river; 41 this.river = river;
42 this.name = name; 42 this.name = name;
43 this.measurementType = measurementType; 43 this.measurementType = measurementType;
44 this.riverside = riverside; 44 this.riverside = riverside;
45 this.station = station; 45 this.station = station;
46 this.range = range; 46 this.range = range;
47 this.gauge = gauge; 47 this.gauge = gauge;
48 this.observationTimerange = observationTimerange; 48 this.observationTimerange = observationTimerange;
49 this.operator = operator; 49 this.operator = operator;
50 this.comment = comment; 50 this.description = description;
51 } 51 }
52 52
53 @Id 53 @Id
54 @SequenceGenerator(name = "SEQ_MEASUREMENT_STATION_ID_SEQ", sequenceName = "MEASUREMENT_STATION_ID_SEQ", allocationSize = 1) 54 @SequenceGenerator(name = "SEQ_MEASUREMENT_STATION_ID_SEQ", sequenceName = "MEASUREMENT_STATION_ID_SEQ", allocationSize = 1)
55 @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_MEASUREMENT_STATION_ID_SEQ") 55 @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "SEQ_MEASUREMENT_STATION_ID_SEQ")
145 145
146 public void setOperator(String operator) { 146 public void setOperator(String operator) {
147 this.operator = operator; 147 this.operator = operator;
148 } 148 }
149 149
150 @Column(name = "comment") 150 @Column(name = "description")
151 public String getComment() { 151 public String getDescription() {
152 return comment; 152 return description;
153 } 153 }
154 154
155 public void setComment(String comment) { 155 public void setDescription(String description) {
156 this.comment = comment; 156 this.description = description;
157 } 157 }
158 158
159 } 159 }
http://dive4elements.wald.intevation.org