[Dive4elements-commits] [PATCH 1 of 2] Remove debris of (Import)WaterlevelDiff*-model classes
Wald Commits
scm-commit at wald.intevation.org
Tue Mar 12 12:08:43 CET 2013
# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1363086923 -3600
# Node ID 8959e1f8d297f45ed9bb8390482bdf3e018b4e5e
# Parent 07671181414d3d3a3f78d7917b0d00b795776867
Remove debris of (Import)WaterlevelDiff*-model classes.
diff -r 07671181414d -r 8959e1f8d297 flys-backend/src/main/java/de/intevation/flys/importer/ImportWaterlevelDifference.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportWaterlevelDifference.java Tue Mar 12 12:09:02 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,53 +0,0 @@
-package de.intevation.flys.importer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import de.intevation.flys.model.WaterlevelDifference;
-
-import org.apache.log4j.Logger;
-
-/**
- * This Model class does not have a representive hibernated version,
- * as it is in transition to be remoed.
- */
-public class ImportWaterlevelDifference {
-
- private static final Logger log = Logger
- .getLogger(ImportWaterlevelDifference.class);
-
- private ImportUnit unit;
-
- private String description;
-
- private List<ImportWaterlevelDifferenceColumn> columns;
-
- private WaterlevelDifference peer;
-
- public ImportWaterlevelDifference(String description) {
- this.columns = new ArrayList<ImportWaterlevelDifferenceColumn>();
-
- this.description = description;
- }
-
- public void setUnit(ImportUnit unit) {
- this.unit = unit;
- }
-
- public ImportUnit getUnit() {
- return unit;
- }
-
- public String getDescription() {
- return description;
- }
-
- public List<ImportWaterlevelDifferenceColumn> getColumns() {
- return columns;
- }
-
- public void addValue(ImportWaterlevelDifferenceColumn column) {
- this.columns.add(column);
- }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 07671181414d -r 8959e1f8d297 flys-backend/src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceColumn.java
--- a/flys-backend/src/main/java/de/intevation/flys/importer/ImportWaterlevelDifferenceColumn.java Tue Mar 12 12:09:02 2013 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,89 +0,0 @@
-package de.intevation.flys.importer;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.apache.log4j.Logger;
-
-import org.hibernate.Session;
-import org.hibernate.Query;
-
-import de.intevation.flys.model.WaterlevelDifference;
-import de.intevation.flys.model.WaterlevelDifferenceColumn;
-
-
-public class ImportWaterlevelDifferenceColumn {
-
- private static final Logger log =
- Logger.getLogger(ImportWaterlevelDifferenceColumn.class);
-
-
- private String description;
-
- private List<ImportWaterlevelDifferenceValue> values;
-
- private WaterlevelDifferenceColumn peer;
-
-
- public ImportWaterlevelDifferenceColumn(String description) {
- this.values = new ArrayList<ImportWaterlevelDifferenceValue>();
-
- this.description = description;
- }
-
-
- public String getDescription() {
- return description;
- }
-
-
- public void addValue(ImportWaterlevelDifferenceValue value) {
- this.values.add(value);
- }
-
- public List<ImportWaterlevelDifferenceValue> getValues() {
- return values;
- }
-
- public void storeDependencies(WaterlevelDifference difference) {
- log.info("store dependencies");
-
- WaterlevelDifferenceColumn peer = getPeer(difference);
-
- int i = 0;
-
- for (ImportWaterlevelDifferenceValue value: values) {
- value.storeDependencies(peer);
- i++;
- }
-
- log.info("stored " + i + " waterlevel difference values");
- }
-
-
- public WaterlevelDifferenceColumn getPeer(WaterlevelDifference diff) {
- if (peer == null) {
- Session session = ImporterSession.getInstance().getDatabaseSession();
- Query query = session.createQuery(
- "from WaterlevelDifferenceColumn where " +
- " difference=:difference and " +
- " description=:description"
- );
-
- query.setParameter("difference", diff);
- query.setParameter("description", description);
-
- List<WaterlevelDifferenceColumn> cols = query.list();
- if (cols.isEmpty()) {
- peer = new WaterlevelDifferenceColumn(diff, description);
- session.save(peer);
- }
- else {
- peer = cols.get(0);
- }
- }
-
- return peer;
- }
-}
-// vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :
diff -r 07671181414d -r 8959e1f8d297 flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifference.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifference.java Tue Mar 12 12:09:02 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 07671181414d -r 8959e1f8d297 flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceColumn.java Tue Mar 12 12:09:02 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 07671181414d -r 8959e1f8d297 flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java
--- a/flys-backend/src/main/java/de/intevation/flys/model/WaterlevelDifferenceValue.java Tue Mar 12 12:09:02 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 :
More information about the Dive4elements-commits
mailing list