[Dive4elements-commits] [PATCH 2 of 3] removed obsolete classes
Wald Commits
scm-commit at wald.intevation.org
Fri Mar 8 12:52:38 CET 2013
# HG changeset patch
# User Tom Gottfried <tom at intevation.de>
# Date 1362743472 -3600
# Node ID d4c276bbbc6cf119f82b50d27f725335512de4ef
# Parent 646c154477fead9b5936ca06544ffdcf3f3abc5f
removed obsolete classes
diff -r 646c154477fe -r d4c276bbbc6c flys-backend/src/main/java/de/intevation/flys/model/Waterlevel.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/Waterlevel.java Fri Mar 08 12:45:48 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,113 +0,0 @@
-package de.intevation.flys.model;
-
-import java.io.Serializable;
-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;
-
-
-
-/** Mapped Waterlevel. */
- at Entity
- at Table(name = "waterlevel")
-public class Waterlevel
-implements Serializable
-{
- private static Logger logger = Logger.getLogger(Waterlevel.class);
-
- private Integer id;
-
- private River river;
-
- private Unit unit;
-
- private String description;
-
- private List<WaterlevelQRange> qRanges;
-
-
- public Waterlevel() {
- }
-
- public Waterlevel(River river, Unit unit) {
- this.river = river;
- this.unit = unit;
- }
-
- public Waterlevel(River river, Unit unit, String description) {
- this(river, unit);
- this.description = description;
- }
-
- @Id
- @SequenceGenerator(
- name = "SEQUENCE_WATERLEVEL_ID_SEQ",
- sequenceName = "WATERLEVEL_ID_SEQ",
- allocationSize = 1)
- @GeneratedValue(
- strategy = GenerationType.SEQUENCE,
- generator = "SEQUENCE_WATERLEVEL_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="waterlevel_id")
- public List<WaterlevelQRange> getQRanges() {
- return qRanges;
- }
-
- public void setQRanges(List<WaterlevelQRange> qRanges) {
- this.qRanges = qRanges;
- }
-
- public void addQRange(WaterlevelQRange qRange) {
- qRanges.add(qRange);
- }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 646c154477fe -r d4c276bbbc6c flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifference.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifference.java Fri Mar 08 12:45:48 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,119 +0,0 @@
-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;
-
-
- at Entity
- at 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<WaterlevelDifferenceColumn> columns;
-
- private String description;
-
-
- public WaterlevelDifference() {
- columns = new ArrayList<WaterlevelDifferenceColumn>();
- }
-
-
- 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<WaterlevelDifferenceColumn> getColumns() {
- return columns;
- }
-
- public void setColumns(List<WaterlevelDifferenceColumn> 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 646c154477fe -r d4c276bbbc6c flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java Fri Mar 08 12:45:48 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-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;
-
-
- at Entity
- at 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<WaterlevelDifferenceValue> values;
-
- private String description;
-
-
- public WaterlevelDifferenceColumn() {
- values = new ArrayList<WaterlevelDifferenceValue>();
- }
-
- 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<WaterlevelDifferenceValue> getValues() {
- return values;
- }
-
- public void setValues(List<WaterlevelDifferenceValue> 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 646c154477fe -r d4c276bbbc6c flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java Fri Mar 08 12:45:48 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,94 +0,0 @@
-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;
-
-
- at Entity
- at 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 setValue(Double value) {
- this.value = value;
- }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 646c154477fe -r d4c276bbbc6c flys-backend/src/main/java/de/intevation/flys/model/WaterlevelQRange.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelQRange.java Fri Mar 08 12:45:48 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-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;
-
-
-
-
- at Entity
- at Table(name = "waterlevel_q_range")
-public class WaterlevelQRange
-implements Serializable
-{
- private static Logger logger = Logger.getLogger(WaterlevelQRange.class);
-
- private Integer id;
-
- private Waterlevel waterlevel;
-
- private Double q;
-
- private List<WaterlevelValue> values;
-
-
- public WaterlevelQRange() {
- this.values = new ArrayList<WaterlevelValue>();
- }
-
- public WaterlevelQRange(Waterlevel waterlevel, Double q) {
- this();
- this.q = q;
- this.waterlevel = waterlevel;
- }
-
-
- @Id
- @SequenceGenerator(
- name = "SEQUENCE_WATERLEVEL_Q_RANGE_ID_SEQ",
- sequenceName = "WATERLEVEL_Q_RANGES_ID_SEQ",
- allocationSize = 1)
- @GeneratedValue(
- strategy = GenerationType.SEQUENCE,
- generator = "SEQUENCE_WATERLEVEL_Q_RANGE_ID_SEQ")
- @Column(name = "id")
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- @OneToOne
- @JoinColumn(name = "waterlevel_id" )
- public Waterlevel getWaterlevel() {
- return waterlevel;
- }
-
- public void setWaterlevel(Waterlevel waterlevel) {
- this.waterlevel = waterlevel;
- }
-
- @Column(name = "q")
- public Double getQ() {
- return q;
- }
-
- public void setQ(Double q) {
- this.q = q;
- }
-
- @OneToMany
- @Column(name = "waterlevel_q_range_id")
- public List<WaterlevelValue> getValues() {
- return values;
- }
-
- public void setValues(List<WaterlevelValue> values) {
- this.values = values;
- }
-
- public void addValue(WaterlevelValue value) {
- values.add(value);
- }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 646c154477fe -r d4c276bbbc6c flys-backend/src/main/java/de/intevation/flys/model/WaterlevelValue.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelValue.java Fri Mar 08 12:45:48 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-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;
-
-
-
-
- at Entity
- at Table(name = "waterlevel_values")
-public class WaterlevelValue
-implements Serializable
-{
- private static Logger logger = Logger.getLogger(WaterlevelValue.class);
-
- private Integer id;
-
- private WaterlevelQRange qrange;
-
- private Double station;
- private Double w;
-
-
- public WaterlevelValue() {
- }
-
- public WaterlevelValue(WaterlevelQRange qrange, Double station, Double w) {
- this.qrange = qrange;
- this.station = station;
- this.w = w;
- }
-
-
- @Id
- @SequenceGenerator(
- name = "SEQUENCE_WATERLEVEL_VALUES_ID_SEQ",
- sequenceName = "WATERLEVEL_VALUES_ID_SEQ",
- allocationSize = 1)
- @GeneratedValue(
- strategy = GenerationType.SEQUENCE,
- generator = "SEQUENCE_WATERLEVEL_VALUES_ID_SEQ")
- @Column(name = "id")
- public Integer getId() {
- return id;
- }
-
- public void setId(Integer id) {
- this.id = id;
- }
-
- @OneToOne
- @JoinColumn(name = "waterlevel_q_range_id" )
- public WaterlevelQRange getQrange() {
- return qrange;
- }
-
- public void setQrange(WaterlevelQRange qrange) {
- this.qrange = qrange;
- }
-
- @Column(name = "station")
- public Double getStation() {
- return station;
- }
-
- public void setStation(Double station) {
- this.station = station;
- }
-
- @Column(name = "w")
- public Double getW() {
- return w;
- }
-
- public void setW(Double w) {
- this.w = w;
- }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
More information about the Dive4elements-commits
mailing list