# HG changeset patch
# User Ingo Weinzierl <ingo.weinzierl@intevation.de>
# Date 1303988914 0
# Node ID ed3325a0232a1a4f4e0d91b4b85adf80ad6e2972
# Parent  2d268f9894bbbb7f3edad5a6b87ae78a1cd7e165
Throw an illegal argument exception in LocationDistanceSelect.validate() and WQSelect.validate() if no data has been inserted so far.

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

diff -r 2d268f9894bb -r ed3325a0232a flys-artifacts/ChangeLog
--- a/flys-artifacts/ChangeLog	Thu Apr 28 09:09:44 2011 +0000
+++ b/flys-artifacts/ChangeLog	Thu Apr 28 11:08:34 2011 +0000
@@ -11,6 +11,13 @@
 
 2011-04-28  Ingo Weinzierl <ingo@intevation.de>
 
+	* src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java,
+	  src/main/java/de/intevation/flys/artifacts/states/WQSelect.java:
+	  If no data has been inserted so far, an IllegalArgumentException is
+	  thrown.
+
+2011-04-28  Ingo Weinzierl <ingo@intevation.de>
+
 	* src/main/java/de/intevation/flys/collections/FLYSArtifactCollection.java::
 	  A lot of new methods to retrieve the theme of a facet - used while
 	  creating the output of a facet/artifact. If a facet has no theme yet, it
diff -r 2d268f9894bb -r ed3325a0232a flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java	Thu Apr 28 09:09:44 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/LocationDistanceSelect.java	Thu Apr 28 11:08:34 2011 +0000
@@ -164,6 +164,10 @@
         String toStr   = (String) data.get(TO).getValue();
         String stepStr = (String) data.get(STEP).getValue();
 
+        if (fromStr == null || toStr == null || stepStr == null) {
+            throw new IllegalArgumentException("error_empty_state");
+        }
+
         try {
             double from = Double.parseDouble(fromStr);
             double to   = Double.parseDouble(toStr);
diff -r 2d268f9894bb -r ed3325a0232a flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java
--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java	Thu Apr 28 09:09:44 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/states/WQSelect.java	Thu Apr 28 11:08:34 2011 +0000
@@ -203,6 +203,10 @@
         String toStr   = (String) data.get(WQ_TO).getValue();
         String stepStr = (String) data.get(WQ_STEP).getValue();
 
+        if (fromStr == null || toStr == null || stepStr == null) {
+            throw new IllegalArgumentException("error_empty_state");
+        }
+
         double from = Double.parseDouble(fromStr);
         double to   = Double.parseDouble(toStr);
         double step = Double.parseDouble(stepStr);