Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/model/SedimentDensity.java @ 5441:7c1dd9c3f6bd
remove unit from sediment density and depths (always t/m3 respectively cm, otherwise a typo)
| author | Tom Gottfried <tom.gottfried@intevation.de> |
|---|---|
| date | Tue, 26 Mar 2013 19:29:39 +0100 |
| parents | 8979f2294af9 |
| children |
comparison
equal
deleted
inserted
replaced
| 5440:765013c837b1 | 5441:7c1dd9c3f6bd |
|---|---|
| 23 | 23 |
| 24 private River river; | 24 private River river; |
| 25 | 25 |
| 26 private Depth depth; | 26 private Depth depth; |
| 27 | 27 |
| 28 private Unit unit; | |
| 29 | |
| 30 private List<SedimentDensityValue> values; | 28 private List<SedimentDensityValue> values; |
| 31 | 29 |
| 32 private String description; | 30 private String description; |
| 33 | 31 |
| 34 | 32 |
| 35 public SedimentDensity() { | 33 public SedimentDensity() { |
| 36 } | 34 } |
| 37 | 35 |
| 38 | 36 |
| 39 public SedimentDensity(River river, Depth depth, Unit unit, String desc) { | 37 public SedimentDensity(River river, Depth depth, String desc) { |
| 40 this.river = river; | 38 this.river = river; |
| 41 this.depth = depth; | 39 this.depth = depth; |
| 42 this.unit = unit; | |
| 43 this.description = desc; | 40 this.description = desc; |
| 44 } | 41 } |
| 45 | 42 |
| 46 @Id | 43 @Id |
| 47 @SequenceGenerator( | 44 @SequenceGenerator( |
| 78 | 75 |
| 79 public void setDepth(Depth depth) { | 76 public void setDepth(Depth depth) { |
| 80 this.depth = depth; | 77 this.depth = depth; |
| 81 } | 78 } |
| 82 | 79 |
| 83 @OneToOne | |
| 84 @JoinColumn(name = "unit_id") | |
| 85 public Unit getUnit() { | |
| 86 return unit; | |
| 87 } | |
| 88 | |
| 89 public void setUnit(Unit unit) { | |
| 90 this.unit = unit; | |
| 91 } | |
| 92 | |
| 93 @Column(name = "description") | 80 @Column(name = "description") |
| 94 public String getDescription() { | 81 public String getDescription() { |
| 95 return description; | 82 return description; |
| 96 } | 83 } |
| 97 | 84 |