diff flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java @ 4627:d5821c6f0ab0

Fixed validation in parameter matrix panel. Single selections are allowed now. Avoid adding duplicates of user selection in parameter matrix.
author Raimund Renkert <rrenkert@intevation.de>
date Mon, 03 Dec 2012 17:25:49 +0100
parents 03de5c424f95
children
line wrap: on
line diff
--- a/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java	Mon Dec 03 17:10:08 2012 +0100
+++ b/flys-client/src/main/java/de/intevation/flys/client/client/ui/ParameterMatrixPanel.java	Mon Dec 03 17:25:49 2012 +0100
@@ -176,11 +176,20 @@
         GWT.log ("validation. validation. validation. ");
         List<String> errors = new ArrayList<String>();
         // Early stop on one (only) error.
+        boolean ok = false;
         for (Map.Entry<String, List<String>> entry : matrix.getSelection().entrySet()) {
+            /* single entries are allowed!!
                 if (entry.getValue() == null || entry.getValue().size() == 0) {
                     errors.add(MESSAGES.error_values_needed());
                     return errors;
                 }
+                */
+            if (entry.getValue() != null && entry.getValue().size() > 0) {
+                ok = true;
+            }
+        }
+        if (!ok) {
+            errors.add(MESSAGES.error_values_needed());
         }
         return errors;
     }

http://dive4elements.wald.intevation.org