Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/model/River.java @ 2347:0acf28a3d28a
Removed the Unit from Wsts - added a WstUnit column to rivers.
flys-backend/trunk@2884 c6561f87-3c4e-4783-a992-168aeb5c3f6f
author | Ingo Weinzierl <ingo.weinzierl@intevation.de> |
---|---|
date | Tue, 04 Oct 2011 15:28:19 +0000 |
parents | c3ea91aee989 |
children | 056b3a5aa181 |
comparison
equal
deleted
inserted
replaced
2346:f834b411ca57 | 2347:0acf28a3d28a |
---|---|
10 import javax.persistence.Table; | 10 import javax.persistence.Table; |
11 import javax.persistence.GeneratedValue; | 11 import javax.persistence.GeneratedValue; |
12 import javax.persistence.Column; | 12 import javax.persistence.Column; |
13 import javax.persistence.SequenceGenerator; | 13 import javax.persistence.SequenceGenerator; |
14 import javax.persistence.OneToMany; | 14 import javax.persistence.OneToMany; |
15 import javax.persistence.OneToOne; | |
15 import javax.persistence.JoinColumn; | 16 import javax.persistence.JoinColumn; |
16 import javax.persistence.GenerationType; | 17 import javax.persistence.GenerationType; |
17 | 18 |
18 import java.util.List; | 19 import java.util.List; |
19 | 20 |
35 private String name; | 36 private String name; |
36 | 37 |
37 private boolean kmUp; | 38 private boolean kmUp; |
38 | 39 |
39 private List<Gauge> gauges; | 40 private List<Gauge> gauges; |
41 | |
42 private Unit wstUnit; | |
40 | 43 |
41 @Id | 44 @Id |
42 @SequenceGenerator( | 45 @SequenceGenerator( |
43 name = "SEQUENCE_RIVERS_ID_SEQ", | 46 name = "SEQUENCE_RIVERS_ID_SEQ", |
44 sequenceName = "RIVERS_ID_SEQ", | 47 sequenceName = "RIVERS_ID_SEQ", |
74 } | 77 } |
75 | 78 |
76 public River() { | 79 public River() { |
77 } | 80 } |
78 | 81 |
79 public River(String name) { | 82 public River(String name, Unit wstUnit) { |
80 this.name = name; | 83 this.name = name; |
84 this.wstUnit = wstUnit; | |
81 } | 85 } |
82 | 86 |
83 @OneToMany | 87 @OneToMany |
84 @JoinColumn(name="river_id") | 88 @JoinColumn(name="river_id") |
85 public List<Gauge> getGauges() { | 89 public List<Gauge> getGauges() { |
87 } | 91 } |
88 | 92 |
89 public void setGauges(List<Gauge> gauges) { | 93 public void setGauges(List<Gauge> gauges) { |
90 this.gauges = gauges; | 94 this.gauges = gauges; |
91 } | 95 } |
96 | |
97 | |
98 @OneToOne | |
99 @JoinColumn(name = "wst_unit_id" ) | |
100 public Unit getWstUnit() { | |
101 return wstUnit; | |
102 } | |
103 | |
104 public void setWstUnit(Unit wstUnit) { | |
105 this.wstUnit = wstUnit; | |
106 } | |
107 | |
108 | |
92 | 109 |
93 public String toString() { | 110 public String toString() { |
94 return name != null ? name : ""; | 111 return name != null ? name : ""; |
95 } | 112 } |
96 | 113 |