Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/model/DischargeTable.java @ 467:c8c09e31cdb8
Added new column 'kind' in discharge tables and wst to distinguish between different types.
flys-backend/trunk@1703 c6561f87-3c4e-4783-a992-168aeb5c3f6f
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 15 Apr 2011 10:31:15 +0000 |
| parents | d980e545ccab |
| children | b35c5dc0f8b7 |
comparison
equal
deleted
inserted
replaced
| 466:8bd50b41dea6 | 467:c8c09e31cdb8 |
|---|---|
| 20 public class DischargeTable | 20 public class DischargeTable |
| 21 implements Serializable | 21 implements Serializable |
| 22 { | 22 { |
| 23 private Integer id; | 23 private Integer id; |
| 24 private Gauge gauge; | 24 private Gauge gauge; |
| 25 private Integer kind; | |
| 25 private TimeInterval timeInterval; | 26 private TimeInterval timeInterval; |
| 26 | 27 |
| 27 private List<DischargeTableValue> dischargeTableValues; | 28 private List<DischargeTableValue> dischargeTableValues; |
| 28 | 29 |
| 29 public DischargeTable() { | 30 public DischargeTable() { |
| 31 kind = 0; | |
| 30 } | 32 } |
| 31 | 33 |
| 32 public DischargeTable(Gauge gauge) { | 34 public DischargeTable(Gauge gauge) { |
| 35 this(gauge, 0); | |
| 36 } | |
| 37 | |
| 38 public DischargeTable(Gauge gauge, Integer kind) { | |
| 33 this.gauge = gauge; | 39 this.gauge = gauge; |
| 40 this.kind = kind; | |
| 34 } | 41 } |
| 35 | 42 |
| 36 @Id | 43 @Id |
| 37 @SequenceGenerator( | 44 @SequenceGenerator( |
| 38 name = "SEQUENCE_DISCHARGE_TABLES_ID_SEQ", | 45 name = "SEQUENCE_DISCHARGE_TABLES_ID_SEQ", |
| 49 public void setId(Integer id) { | 56 public void setId(Integer id) { |
| 50 this.id = id; | 57 this.id = id; |
| 51 } | 58 } |
| 52 | 59 |
| 53 @OneToOne | 60 @OneToOne |
| 61 @JoinColumn(name = "gauge_id" ) | |
| 62 public Gauge getGauge() { | |
| 63 return gauge; | |
| 64 } | |
| 65 | |
| 66 public void setGauge(Gauge gauge) { | |
| 67 this.gauge = gauge; | |
| 68 } | |
| 69 | |
| 70 @Column(name = "kind") | |
| 71 public Integer getKind() { | |
| 72 return kind; | |
| 73 } | |
| 74 | |
| 75 public void setKind(Integer kind) { | |
| 76 this.kind = kind; | |
| 77 } | |
| 78 | |
| 79 @OneToOne | |
| 54 @JoinColumn(name = "time_interval_id" ) | 80 @JoinColumn(name = "time_interval_id" ) |
| 55 public TimeInterval getTimeInterval() { | 81 public TimeInterval getTimeInterval() { |
| 56 return timeInterval; | 82 return timeInterval; |
| 57 } | 83 } |
| 58 | 84 |
| 59 public void setTimeInterval(TimeInterval timeInterval) { | 85 public void setTimeInterval(TimeInterval timeInterval) { |
| 60 this.timeInterval = timeInterval; | 86 this.timeInterval = timeInterval; |
| 61 } | |
| 62 | |
| 63 @OneToOne | |
| 64 @JoinColumn(name = "gauge_id" ) | |
| 65 public Gauge getGauge() { | |
| 66 return gauge; | |
| 67 } | |
| 68 | |
| 69 public void setGauge(Gauge gauge) { | |
| 70 this.gauge = gauge; | |
| 71 } | 87 } |
| 72 | 88 |
| 73 @OneToMany | 89 @OneToMany |
| 74 @JoinColumn(name = "table_id") | 90 @JoinColumn(name = "table_id") |
| 75 public List<DischargeTableValue> getDischargeTableValues() { | 91 public List<DischargeTableValue> getDischargeTableValues() { |