--- a/flys-backend/src/main/java/de/intevation/flys/model/DischargeZone.java	Tue Apr 17 13:00:04 2012 +0000
+++ b/flys-backend/src/main/java/de/intevation/flys/model/DischargeZone.java	Wed Apr 18 08:54:55 2012 +0000
@@ -26,15 +26,14 @@
 
     private Integer id;
 
-    private String gaugeName;
-
     private River river;
 
-    private NamedMainValue mainValue;
+    private String gaugeName;
 
-    private BigDecimal lowerFactor;
+    private BigDecimal value;
 
-    private BigDecimal upperFactor;
+    private String lowerDischarge;
+    private String upperDischarge;
 
 
     public DischargeZone() {
@@ -42,17 +41,17 @@
 
 
     public DischargeZone(
-        String         gaugeName,
-        River          river,
-        NamedMainValue mainValue,
-        BigDecimal     lowerFactor,
-        BigDecimal     upperFactor
+        River       river,
+        String      gaugeName,
+        BigDecimal  value,
+        String      lowerDischarge,
+        String      upperDischarge
     ) {
-        this.gaugeName   = gaugeName;
-        this.river       = river;
-        this.mainValue   = mainValue;
-        this.lowerFactor = lowerFactor;
-        this.upperFactor = upperFactor;
+        this.river          = river;
+        this.gaugeName      = gaugeName;
+        this.value          = value;
+        this.lowerDischarge = lowerDischarge;
+        this.upperDischarge = upperDischarge;
     }
 
     @Id
@@ -82,14 +81,13 @@
         this.river = river;
     }
 
-    @OneToOne
-    @JoinColumn(name = "named_main_value_id")
-    public NamedMainValue getMainValue() {
-        return mainValue;
+    @Column(name = "value")
+    public BigDecimal getValue() {
+        return value;
     }
 
-    public void setMainValue(NamedMainValue mainValue) {
-        this.mainValue = mainValue;
+    public void setValue(BigDecimal value) {
+        this.value = value;
     }
 
     @Column(name = "gauge_name")
@@ -101,22 +99,22 @@
         this.gaugeName = gaugeName;
     }
 
-    @Column(name = "lower_factor")
-    public BigDecimal getLowerFactor() {
-        return lowerFactor;
+    @Column(name = "lower_discharge")
+    public String getLowerDischarge() {
+        return lowerDischarge;
     }
 
-    public void setLowerFactor(BigDecimal lowerFactor) {
-        this.lowerFactor = lowerFactor;
+    public void setLowerDischarge(String lowerDischarge) {
+        this.lowerDischarge = lowerDischarge;
     }
 
-    @Column(name = "upper_factor")
-    public BigDecimal getUpperFactor() {
-        return upperFactor;
+    @Column(name = "upper_discharge")
+    public String getUpperDischarge() {
+        return upperDischarge;
     }
 
-    public void setUpperFactor(BigDecimal upperFactor) {
-        this.upperFactor = upperFactor;
+    public void setUpperDischarge(String upperDischarge) {
+        this.upperDischarge = upperDischarge;
     }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :