Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/model/BedHeight.java @ 8560:6fcf4717605f
Meta-data on sounding width associated to bed heights is redundant to real data associated to values.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Mon, 16 Feb 2015 11:48:05 +0100 |
| parents | backend/src/main/java/org/dive4elements/river/model/BedHeightSingle.java@4c3ccf2b0304 |
| children | ff27548d078c |
comparison
equal
deleted
inserted
replaced
| 8559:6d8d7425a6b5 | 8560:6fcf4717605f |
|---|---|
| 34 @Table(name = "bed_height") | 34 @Table(name = "bed_height") |
| 35 public class BedHeight implements Serializable { | 35 public class BedHeight implements Serializable { |
| 36 | 36 |
| 37 private Integer id; | 37 private Integer id; |
| 38 private Integer year; | 38 private Integer year; |
| 39 private Integer soundingWidth; | |
| 40 | 39 |
| 41 private String evaluationBy; | 40 private String evaluationBy; |
| 42 private String description; | 41 private String description; |
| 43 | 42 |
| 44 private River river; | 43 private River river; |
| 61 | 60 |
| 62 | 61 |
| 63 public BedHeight( | 62 public BedHeight( |
| 64 River river, | 63 River river, |
| 65 Integer year, | 64 Integer year, |
| 66 Integer soundingWidth, | |
| 67 BedHeightType type, | 65 BedHeightType type, |
| 68 LocationSystem locationSystem, | 66 LocationSystem locationSystem, |
| 69 ElevationModel curElevationModel, | 67 ElevationModel curElevationModel, |
| 70 Range range | 68 Range range |
| 71 ) { | 69 ) { |
| 72 this( | 70 this( |
| 73 river, | 71 river, |
| 74 year, | 72 year, |
| 75 soundingWidth, | |
| 76 type, | 73 type, |
| 77 locationSystem, | 74 locationSystem, |
| 78 curElevationModel, | 75 curElevationModel, |
| 79 null, | 76 null, |
| 80 range, | 77 range, |
| 84 | 81 |
| 85 | 82 |
| 86 public BedHeight( | 83 public BedHeight( |
| 87 River river, | 84 River river, |
| 88 Integer year, | 85 Integer year, |
| 89 Integer soundingWidth, | |
| 90 BedHeightType type, | 86 BedHeightType type, |
| 91 LocationSystem locationSystem, | 87 LocationSystem locationSystem, |
| 92 ElevationModel curElevationModel, | 88 ElevationModel curElevationModel, |
| 93 ElevationModel oldElevationModel, | 89 ElevationModel oldElevationModel, |
| 94 Range range, | 90 Range range, |
| 95 String evaluationBy, | 91 String evaluationBy, |
| 96 String description | 92 String description |
| 97 ) { | 93 ) { |
| 98 this.river = river; | 94 this.river = river; |
| 99 this.year = year; | 95 this.year = year; |
| 100 this.soundingWidth = soundingWidth; | |
| 101 this.type = type; | 96 this.type = type; |
| 102 this.locationSystem = locationSystem; | 97 this.locationSystem = locationSystem; |
| 103 this.curElevationModel = curElevationModel; | 98 this.curElevationModel = curElevationModel; |
| 104 this.oldElevationModel = oldElevationModel; | 99 this.oldElevationModel = oldElevationModel; |
| 105 this.range = range; | 100 this.range = range; |
| 142 | 137 |
| 143 public void setYear(Integer year) { | 138 public void setYear(Integer year) { |
| 144 this.year = year; | 139 this.year = year; |
| 145 } | 140 } |
| 146 | 141 |
| 147 @Column(name = "sounding_width") | |
| 148 public Integer getSoundingWidth() { | |
| 149 return soundingWidth; | |
| 150 } | |
| 151 | |
| 152 public void setSoundingWidth(Integer soundingWidth) { | |
| 153 this.soundingWidth = soundingWidth; | |
| 154 } | |
| 155 | |
| 156 @OneToOne | 142 @OneToOne |
| 157 @JoinColumn(name = "type_id") | 143 @JoinColumn(name = "type_id") |
| 158 public BedHeightType getType() { | 144 public BedHeightType getType() { |
| 159 return type; | 145 return type; |
| 160 } | 146 } |