# HG changeset patch # User Ingo Weinzierl # Date 1335274082 0 # Node ID dfc5bc5660c23b4688043ed1d2bf7eba894d571e # Parent c1c6c91906363db0f648794e85e446675c7f921c Added model classes for MINFO specific waterlevel differences. flys-backend/trunk@4290 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r c1c6c9190636 -r dfc5bc5660c2 flys-backend/ChangeLog --- a/flys-backend/ChangeLog Tue Apr 24 13:04:30 2012 +0000 +++ b/flys-backend/ChangeLog Tue Apr 24 13:28:02 2012 +0000 @@ -1,3 +1,13 @@ +2012-04-24 Ingo Weinzierl + + * src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java, + src/main/java/de/intevation/flys/model/WaterlevelDifference.java, + src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java: + New model classes for MINFO specific waterlevel differences. + + * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: + Registered new model classes. + 2012-04-24 Ingo Weinzierl * doc/schema/oracle-minfo.sql, diff -r c1c6c9190636 -r dfc5bc5660c2 flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java --- a/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java Tue Apr 24 13:04:30 2012 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java Tue Apr 24 13:28:02 2012 +0000 @@ -76,6 +76,9 @@ import de.intevation.flys.model.TimeInterval; import de.intevation.flys.model.Unit; import de.intevation.flys.model.Waterlevel; +import de.intevation.flys.model.WaterlevelDifference; +import de.intevation.flys.model.WaterlevelDifferenceColumn; +import de.intevation.flys.model.WaterlevelDifferenceValue; import de.intevation.flys.model.WaterlevelQRange; import de.intevation.flys.model.WaterlevelValue; import de.intevation.flys.model.WstColumn; @@ -288,6 +291,9 @@ cfg.addAnnotatedClass(TimeInterval.class); cfg.addAnnotatedClass(Unit.class); cfg.addAnnotatedClass(Waterlevel.class); + cfg.addAnnotatedClass(WaterlevelDifference.class); + cfg.addAnnotatedClass(WaterlevelDifferenceColumn.class); + cfg.addAnnotatedClass(WaterlevelDifferenceValue.class); cfg.addAnnotatedClass(WaterlevelQRange.class); cfg.addAnnotatedClass(WaterlevelValue.class); cfg.addAnnotatedClass(WstColumn.class); diff -r c1c6c9190636 -r dfc5bc5660c2 flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifference.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifference.java Tue Apr 24 13:28:02 2012 +0000 @@ -0,0 +1,119 @@ +package de.intevation.flys.model; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.GeneratedValue; +import javax.persistence.Column; +import javax.persistence.SequenceGenerator; +import javax.persistence.GenerationType; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.OneToMany; + +import org.apache.log4j.Logger; + + +@Entity +@Table(name = "waterlevel_difference") +public class WaterlevelDifference +implements Serializable +{ + private static Logger logger = Logger.getLogger(WaterlevelDifference.class); + + private Integer id; + + private River river; + + private Unit unit; + + private List columns; + + private String description; + + + public WaterlevelDifference() { + columns = new ArrayList(); + } + + + public WaterlevelDifference(River river, Unit unit) { + this(); + + this.river = river; + this.unit = unit; + } + + + public WaterlevelDifference(River river, Unit unit, String description) { + this(river, unit); + + this.description = description; + } + + + @Id + @SequenceGenerator( + name = "SEQUENCE_WATERLEVEL_DIFFERENCE_ID_SEQ", + sequenceName = "WATERLEVEL_DIFFERENCE_ID_SEQ", + allocationSize = 1) + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "SEQUENCE_WATERLEVEL_DIFFERENCE_ID_SEQ") + @Column(name = "id") + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @OneToOne + @JoinColumn(name = "river_id" ) + public River getRiver() { + return river; + } + + public void setRiver(River river) { + this.river = river; + } + + @OneToOne + @JoinColumn(name = "unit_id") + public Unit getUnit() { + return unit; + } + + public void setUnit(Unit unit) { + this.unit = unit; + } + + @Column(name = "description") + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @OneToMany + @JoinColumn(name = "difference_id") + public List getColumns() { + return columns; + } + + public void setColumns(List columns) { + this.columns = columns; + } + + public void addColumn(WaterlevelDifferenceColumn column) { + this.columns.add(column); + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r c1c6c9190636 -r dfc5bc5660c2 flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java Tue Apr 24 13:28:02 2012 +0000 @@ -0,0 +1,104 @@ +package de.intevation.flys.model; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.List; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.GeneratedValue; +import javax.persistence.Column; +import javax.persistence.SequenceGenerator; +import javax.persistence.GenerationType; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; +import javax.persistence.OneToMany; + +import org.apache.log4j.Logger; + + +@Entity +@Table(name = "waterlevel_difference_column") +public class WaterlevelDifferenceColumn +implements Serializable +{ + private static Logger logger = + Logger.getLogger(WaterlevelDifferenceColumn.class); + + + private Integer id; + + private WaterlevelDifference difference; + + private List values; + + private String description; + + + public WaterlevelDifferenceColumn() { + values = new ArrayList(); + } + + public WaterlevelDifferenceColumn( + WaterlevelDifference difference, + String description + ) { + this(); + + this.difference = difference; + this.description = description; + } + + + @Id + @SequenceGenerator( + name = "SEQUENCE_WATERLEVEL_DIFF_COLUMN_ID_SEQ", + sequenceName = "WATERLEVEL_DIFF_COLUMN_ID_SEQ", + allocationSize = 1) + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "SEQUENCE_WATERLEVEL_DIFF_COLUMN_ID_SEQ") + @Column(name = "id") + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @OneToOne + @JoinColumn(name = "difference_id" ) + public WaterlevelDifference getDifference() { + return difference; + } + + public void setDifference(WaterlevelDifference difference) { + this.difference = difference; + } + + @Column(name = "description") + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + @OneToMany + @JoinColumn(name = "column_id") + public List getValues() { + return values; + } + + public void setValues(List values) { + this.values = values; + } + + public void addValue(WaterlevelDifferenceValue value) { + this.values.add(value); + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r c1c6c9190636 -r dfc5bc5660c2 flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java Tue Apr 24 13:28:02 2012 +0000 @@ -0,0 +1,94 @@ +package de.intevation.flys.model; + +import java.io.Serializable; + +import javax.persistence.Entity; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.GeneratedValue; +import javax.persistence.Column; +import javax.persistence.SequenceGenerator; +import javax.persistence.GenerationType; +import javax.persistence.JoinColumn; +import javax.persistence.OneToOne; + +import org.apache.log4j.Logger; + + +@Entity +@Table(name = "waterlevel_difference_values") +public class WaterlevelDifferenceValue +implements Serializable +{ + private static Logger logger = + Logger.getLogger(WaterlevelDifferenceValue.class); + + + private Integer id; + + private WaterlevelDifferenceColumn column; + + private Double station; + private Double value; + + + public WaterlevelDifferenceValue() { + } + + public WaterlevelDifferenceValue( + WaterlevelDifferenceColumn column, + Double station, + Double value + ) { + this.column = column; + this.station = station; + this.value = value; + } + + + @Id + @SequenceGenerator( + name = "SEQUENCE_WATERLEVEL_DIFF_VALUES_ID_SEQ", + sequenceName = "WATERLEVEL_DIFF_VALUES_ID_SEQ", + allocationSize = 1) + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "SEQUENCE_WATERLEVEL_DIFF_VALUES_ID_SEQ") + @Column(name = "id") + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @OneToOne + @JoinColumn(name = "column_id" ) + public WaterlevelDifferenceColumn getColumn() { + return column; + } + + public void setColumn(WaterlevelDifferenceColumn column) { + this.column = column; + } + + @Column(name = "station") + public Double getStation() { + return station; + } + + public void setStation(Double station) { + this.station = station; + } + + @Column(name = "value") + public Double getValue() { + return value; + } + + public void setValues(Double value) { + this.value = value; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :