Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/model/SQRelationValue.java @ 5458:e667c127b600
Removed column 'fraction' from sq relation parser and model.
| author | Raimund Renkert <rrenkert@intevation.de> |
|---|---|
| date | Wed, 27 Mar 2013 13:02:53 +0100 |
| parents | 13596605e81f |
| children |
comparison
equal
deleted
inserted
replaced
| 5457:1b676aefaf3a | 5458:e667c127b600 |
|---|---|
| 20 private Integer id; | 20 private Integer id; |
| 21 | 21 |
| 22 private SQRelation sqRelation; | 22 private SQRelation sqRelation; |
| 23 | 23 |
| 24 private String parameter; | 24 private String parameter; |
| 25 private String fraction; | |
| 26 | 25 |
| 27 private MeasurementStation measurementStation; | 26 private MeasurementStation measurementStation; |
| 28 | 27 |
| 29 private Double a; | 28 private Double a; |
| 30 private Double b; | 29 private Double b; |
| 41 | 40 |
| 42 | 41 |
| 43 public SQRelationValue( | 42 public SQRelationValue( |
| 44 SQRelation sqRelation, | 43 SQRelation sqRelation, |
| 45 String parameter, | 44 String parameter, |
| 46 String fraction, | |
| 47 MeasurementStation measurementStation, | 45 MeasurementStation measurementStation, |
| 48 Double a, | 46 Double a, |
| 49 Double b, | 47 Double b, |
| 50 Double qMax, | 48 Double qMax, |
| 51 Double rSQ, | 49 Double rSQ, |
| 54 Double cFerguson, | 52 Double cFerguson, |
| 55 Double cDuan | 53 Double cDuan |
| 56 ) { | 54 ) { |
| 57 this.sqRelation = sqRelation; | 55 this.sqRelation = sqRelation; |
| 58 this.parameter = parameter; | 56 this.parameter = parameter; |
| 59 this.fraction = fraction; | |
| 60 this.measurementStation = measurementStation; | 57 this.measurementStation = measurementStation; |
| 61 this.a = a; | 58 this.a = a; |
| 62 this.b = b; | 59 this.b = b; |
| 63 this.qMax = qMax; | 60 this.qMax = qMax; |
| 64 this.rSQ = rSQ; | 61 this.rSQ = rSQ; |
| 104 } | 101 } |
| 105 | 102 |
| 106 public void setParameter(String parameter) { | 103 public void setParameter(String parameter) { |
| 107 this.parameter = parameter; | 104 this.parameter = parameter; |
| 108 } | 105 } |
| 109 | |
| 110 | |
| 111 @Column(name = "fraction") | |
| 112 public String getFraction() { | |
| 113 return fraction; | |
| 114 } | |
| 115 | |
| 116 public void setFraction(String fraction) { | |
| 117 this.fraction = fraction; | |
| 118 } | |
| 119 | |
| 120 | 106 |
| 121 @OneToOne | 107 @OneToOne |
| 122 @JoinColumn(name = "measurement_station_id") | 108 @JoinColumn(name = "measurement_station_id") |
| 123 public MeasurementStation getMeasurementStation() { | 109 public MeasurementStation getMeasurementStation() { |
| 124 return measurementStation; | 110 return measurementStation; |