# HG changeset patch # User Sascha L. Teichmann # Date 1309957019 0 # Node ID 491892931761dda32b5b2b2cf96fdb57f8b01c06 # Parent 1e3979e07b9e387e1115995884de96fb2b088fb9 Added Hibernate models for cross-sections and their points. flys-backend/trunk@2290 c6561f87-3c4e-4783-a992-168aeb5c3f6f diff -r 1e3979e07b9e -r 491892931761 flys-backend/ChangeLog --- a/flys-backend/ChangeLog Wed Jul 06 10:46:02 2011 +0000 +++ b/flys-backend/ChangeLog Wed Jul 06 12:56:59 2011 +0000 @@ -1,3 +1,12 @@ +2011-07-06 Sascha L. Teichmann + + * src/main/java/de/intevation/flys/model/CrossSection.java, + src/main/java/de/intevation/flys/model/CrossSectionPoint.java: + New. Hibernate models for cross-sections and their forming points. + + * src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java: + Registered the new models. + 2011-07-06 Sascha L. Teichmann * src/main/java/de/intevation/flys/model/Point3d.java: New. point3d model diff -r 1e3979e07b9e -r 491892931761 flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java --- a/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java Wed Jul 06 10:46:02 2011 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/backend/SessionFactoryProvider.java Wed Jul 06 12:56:59 2011 +0000 @@ -12,6 +12,8 @@ import de.intevation.flys.model.Annotation; import de.intevation.flys.model.AnnotationType; import de.intevation.flys.model.Attribute; +import de.intevation.flys.model.CrossSection; +import de.intevation.flys.model.CrossSectionPoint; import de.intevation.flys.model.DischargeTable; import de.intevation.flys.model.DischargeTableValue; import de.intevation.flys.model.Edge; @@ -118,6 +120,8 @@ cfg.addAnnotatedClass(Annotation.class); cfg.addAnnotatedClass(AnnotationType.class); cfg.addAnnotatedClass(Attribute.class); + cfg.addAnnotatedClass(CrossSection.class); + cfg.addAnnotatedClass(CrossSectionPoint.class); cfg.addAnnotatedClass(DischargeTable.class); cfg.addAnnotatedClass(DischargeTableValue.class); cfg.addAnnotatedClass(Edge.class); diff -r 1e3979e07b9e -r 491892931761 flys-backend/src/main/java/de/intevation/flys/model/CrossSection.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/model/CrossSection.java Wed Jul 06 12:56:59 2011 +0000 @@ -0,0 +1,90 @@ +package de.intevation.flys.model; + +import java.io.Serializable; + +import java.math.BigDecimal; + +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.OneToOne; +import javax.persistence.OneToMany; +import javax.persistence.JoinColumn; + +@Entity +@Table(name = "cross_sections") +public class CrossSection +implements Serializable +{ + private Integer id; + private BigDecimal km; + private River river; + private TimeInterval timeInterval; + private List points; + + public CrossSection() { + } + + @Id + @SequenceGenerator( + name = "SEQUENCE_CROSS_SECTIONS_ID_SEQ", + sequenceName = "CROSS_SECTIONS_ID_SEQ", + allocationSize = 1) + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "SEQUENCE_CROSS_SECTIONS_ID_SEQ") + @Column(name = "id") + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @Column(name = "x") + public BigDecimal getKm() { + return km; + } + + public void setKm(BigDecimal km) { + this.km = km; + } + + @OneToOne + @JoinColumn(name = "river_id") + public River getRiver() { + return river; + } + + public void setRiver(River river) { + this.river = river; + } + + @OneToOne + @JoinColumn(name = "time_interval_id") + public TimeInterval getTimeInterval() { + return timeInterval; + } + + public void setTimeInterval(TimeInterval timeInterval) { + this.timeInterval = timeInterval; + } + + @OneToMany + @JoinColumn(name="cross_section_id") + public List getPoints() { + return points; + } + + public void setPoints(List points) { + this.points = points; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 : diff -r 1e3979e07b9e -r 491892931761 flys-backend/src/main/java/de/intevation/flys/model/CrossSectionPoint.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/flys-backend/src/main/java/de/intevation/flys/model/CrossSectionPoint.java Wed Jul 06 12:56:59 2011 +0000 @@ -0,0 +1,74 @@ +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.OneToOne; +import javax.persistence.JoinColumn; + +@Entity +@Table(name = "cross_section_points") +public class CrossSectionPoint +implements Serializable +{ + private Integer id; + private CrossSection crossSection; + private Point3d point; + private Integer colPos; + + public CrossSectionPoint() { + } + + @Id + @SequenceGenerator( + name = "SEQUENCE_CROSS_SECTION_POINTS_ID_SEQ", + sequenceName = "CROSS_SECTION_POINTS_ID_SEQ", + allocationSize = 1) + @GeneratedValue( + strategy = GenerationType.SEQUENCE, + generator = "SEQUENCE_CROSS_SECTION_POINTS_ID_SEQ") + @Column(name = "id") + public Integer getId() { + return id; + } + + public void setId(Integer id) { + this.id = id; + } + + @OneToOne + @JoinColumn(name = "cross_section_id") + public CrossSection getCrossSection() { + return crossSection; + } + + public void setCrossSection(CrossSection crossSection) { + this.crossSection = crossSection; + } + + @OneToOne + @JoinColumn(name = "point3d_id") + public Point3d getPoint() { + return point; + } + + public void setPoint(Point3d point) { + this.point = point; + } + + @Column(name = "col_pos") + public Integer getColPos() { + return colPos; + } + + public void setColPos(Integer colPos) { + this.colPos = colPos; + } +} +// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :