# HG changeset patch
# User Sascha L. Teichmann <sascha.teichmann@intevation.de>
# Date 1338910658 0
# Node ID 5d286d7e54cd04ad6be2eadd3bff2a0e15c5d85b
# Parent  005f0130e6d6842f36ad95491292074b9d6d0f04
FixA: Prevent duplicates in analysis periods.

flys-artifacts/trunk@4592 c6561f87-3c4e-4783-a992-168aeb5c3f6f

diff -r 005f0130e6d6 -r 5d286d7e54cd flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Tue Jun 05 15:28:32 2012 +0000
+++ b/flys-artifacts/ChangeLog	Tue Jun 05 15:37:38 2012 +0000
@@ -1,3 +1,11 @@
+2012-06-05	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
+
+	* src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java:
+	  Prevent duplicates in analysis periods.
+
+	* src/main/java/de/intevation/flys/artifacts/model/fixings/DateRange.java:
+	  Added equals.
+
 2012-06-05	Sascha L. Teichmann	<sascha.teichmann@intevation.de>
 
 	* src/main/java/de/intevation/flys/utils/EpsilonComparator.java:
diff -r 005f0130e6d6 -r 5d286d7e54cd flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java	Tue Jun 05 15:28:32 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FixationArtifactAccess.java	Tue Jun 05 15:37:38 2012 +0000
@@ -320,7 +320,10 @@
                     try {
                         Date from = new Date(Long.parseLong(fromTo[0]));
                         Date to   = new Date(Long.parseLong(fromTo[1]));
-                        aPs.add(new DateRange(from, to));
+                        DateRange aP = new DateRange(from, to);
+                        if (!aPs.contains(aP)) {
+                            aPs.add(aP);
+                        }
                     }
                     catch (NumberFormatException nfe) {
                         log.warn("ana_data contains no long values.", nfe);
diff -r 005f0130e6d6 -r 5d286d7e54cd flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/DateRange.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/DateRange.java	Tue Jun 05 15:28:32 2012 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/model/fixings/DateRange.java	Tue Jun 05 15:37:38 2012 +0000
@@ -30,5 +30,21 @@
     public void setTo(Date to) {
         this.to = to;
     }
+
+    private static final boolean equalDates(Date a, Date b) {
+        if (a == null && b != null) return false;
+        if (a != null && b == null) return false;
+        if (a == null) return true;
+        return a.equals(b);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+        if (!(other instanceof DateRange)) {
+            return false;
+        }
+        DateRange o = (DateRange)other;
+        return equalDates(from, o.from) && equalDates(to, o.to);
+    }
 }
 // vim:set ts=4 sw=4 si et sta sts=4 fenc=utf8 :