diff flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/StaticSedimentLoadCacheKey.java @ 4370:6a65e7ef43c0

Updated data object and factory for sediment load. * Added new data fields to object and cache key. * Fixed SQL statement in factory and fill load objects correctly. *
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 02 Nov 2012 14:48:16 +0100
parents 3051bc28ac43
children 3937c6a85db4
line wrap: on
line diff
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/StaticSedimentLoadCacheKey.java	Fri Nov 02 14:44:11 2012 +0100
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/StaticSedimentLoadCacheKey.java	Fri Nov 02 14:48:16 2012 +0100
@@ -12,18 +12,21 @@
     private String river;
     private double startKm;
     private double endKm;
-    private Date date;
+    private int sYear;
+    private int eYear;
 
     public StaticSedimentLoadCacheKey(
         String river,
         double startKm,
         double endKm,
-        Date date
+        int sYear,
+        int eYear
     ) {
         this.river = river;
         this.startKm = startKm;
         this.endKm = endKm;
-        this.date = date;
+        this.sYear = sYear;
+        this.eYear = eYear;
     }
 
     public int hashCode() {
@@ -31,7 +34,8 @@
         builder.append(river);
         builder.append(startKm);
         builder.append(endKm);
-        builder.append(date);
+        builder.append(sYear);
+        builder.append(eYear);
         return builder.toHashCode();
     }
 
@@ -43,6 +47,7 @@
         return this.river == o.river &&
             this.startKm == o.startKm &&
             this.endKm == o.endKm &&
-            this.date == o.date;
+            this.sYear == o.sYear &&
+            this.eYear == o.eYear;
     }
 }

http://dive4elements.wald.intevation.org