diff flys-backend/src/main/java/de/intevation/flys/model/Wst.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 f834b411ca57
children 027736510a30
line wrap: on
line diff
--- a/flys-backend/src/main/java/de/intevation/flys/model/Wst.java	Tue Oct 04 06:47:00 2011 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/Wst.java	Tue Oct 04 15:28:19 2011 +0000
@@ -34,7 +34,6 @@
     private River   river;
     private String  description;
     private Integer kind;
-    private Unit    unit;
 
     private List<WstColumn> columns;
 
@@ -42,14 +41,13 @@
     }
 
     public Wst(River river, String description) {
-        this(river, description, 0, null);
+        this(river, description, 0);
     }
 
-    public Wst(River river, String description, Integer kind, Unit unit) {
+    public Wst(River river, String description, Integer kind) {
         this.river       = river;
         this.description = description;
         this.kind        = kind;
-        this.unit        = unit;
     }
 
     @Id
@@ -108,16 +106,6 @@
     }
 
 
-    @OneToOne
-    @JoinColumn(name = "unit_id" )
-    public Unit getUnit() {
-        return unit;
-    }
-
-    public void setUnit(Unit unit) {
-        this.unit = unit;
-    }
-
     /**
      * Determines the min and max Q values of this WST. The min value is placed
      * in the first field of the resulting array - the max value is placed in

http://dive4elements.wald.intevation.org