Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/model/SedimentDensityValue.java @ 5528:33d735f5433e
Merged.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Tue, 02 Apr 2013 08:58:24 +0200 |
| parents | db6c7268b08e |
| children |
comparison
equal
deleted
inserted
replaced
| 5527:6dbc111e9aec | 5528:33d735f5433e |
|---|---|
| 21 private Integer id; | 21 private Integer id; |
| 22 | 22 |
| 23 private SedimentDensity sedimentDensity; | 23 private SedimentDensity sedimentDensity; |
| 24 | 24 |
| 25 private BigDecimal station; | 25 private BigDecimal station; |
| 26 private BigDecimal shoreOffset; | |
| 26 private BigDecimal density; | 27 private BigDecimal density; |
| 27 private BigDecimal year; | 28 private BigDecimal year; |
| 28 | 29 |
| 29 private String description; | 30 private String description; |
| 30 | 31 |
| 34 | 35 |
| 35 | 36 |
| 36 public SedimentDensityValue( | 37 public SedimentDensityValue( |
| 37 SedimentDensity sedimentDensity, | 38 SedimentDensity sedimentDensity, |
| 38 BigDecimal station, | 39 BigDecimal station, |
| 40 BigDecimal shoreOffset, | |
| 39 BigDecimal density, | 41 BigDecimal density, |
| 40 BigDecimal year, | 42 BigDecimal year, |
| 41 String desc | 43 String desc |
| 42 ) { | 44 ) { |
| 43 this.sedimentDensity = sedimentDensity; | 45 this.sedimentDensity = sedimentDensity; |
| 44 this.station = station; | 46 this.station = station; |
| 47 this.shoreOffset = shoreOffset; | |
| 45 this.density = density; | 48 this.density = density; |
| 46 this.year = year; | 49 this.year = year; |
| 47 this.description = desc; | 50 this.description = desc; |
| 48 } | 51 } |
| 49 | 52 |
| 81 | 84 |
| 82 public void setStation(BigDecimal station) { | 85 public void setStation(BigDecimal station) { |
| 83 this.station = station; | 86 this.station = station; |
| 84 } | 87 } |
| 85 | 88 |
| 89 @Column(name = "shore_offset") | |
| 90 public BigDecimal getShoreOffset() { | |
| 91 return shoreOffset; | |
| 92 } | |
| 93 | |
| 94 public void setShoreOffset(BigDecimal shoreOffset) { | |
| 95 this.shoreOffset = shoreOffset; | |
| 96 } | |
| 97 | |
| 86 @Column(name = "density") | 98 @Column(name = "density") |
| 87 public BigDecimal getDensity() { | 99 public BigDecimal getDensity() { |
| 88 return density; | 100 return density; |
| 89 } | 101 } |
| 90 | 102 |