--- a/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java	Fri Oct 09 07:49:47 2009 +0000
+++ b/gnv-artifacts/src/main/java/de/intevation/gnv/utils/InputValidator.java	Fri Oct 09 07:54:48 2009 +0000
@@ -10,7 +10,7 @@
 
 /**
  * @author Tim Englich <tim.englich@intevation.de>
- *
+ * 
  */
 public class InputValidator {
     /**
@@ -24,36 +24,46 @@
     public InputValidator() {
         super();
     }
-    
-    public boolean isInputValid(String input, String type){
-        log.debug("InputValidator.isInputValid " + input+ " "+type);
+
+    public boolean isInputValid(String input, String type) {
+        log.debug("InputValidator.isInputValid " + input + " " + type);
         boolean returnValue = false;
         String[] values = input.split(",");
-        for (int i = 0; i < values.length; i++){
+        for (int i = 0; i < values.length; i++) {
             boolean valid;
-            if ("Integer".equalsIgnoreCase(type)){
+            if ("Integer".equalsIgnoreCase(type)) {
                 valid = GenericValidator.isInt(values[i].trim());
-            }else if ("Double".equalsIgnoreCase(type)){
-                    valid = GenericValidator.isDouble(values[i].trim());
-            }else if ("String".equalsIgnoreCase(type)){
-                valid = GenericValidator.matchRegexp(values[i], "[a-zA-Z0-9]"); // TODO: FIXME: VALIDATE REGEXP
-            }else if ("Date".equalsIgnoreCase(type)){
-                valid = GenericValidator.isDate(values[i].trim(), DateUtils.DATE_PATTERN, true);
-            }else if ("Point".equalsIgnoreCase(type)){
-                valid = GenericValidator.matchRegexp(values[i], "[0-9]"); // TODO: FIXME: VALIDATE REGEXP
-            }else if ("AttributeName".equalsIgnoreCase(type)){
-                valid = org.apache.commons.validator.GenericValidator.matchRegexp(values[i], "[a-zA-Z0-9]"); // TODO: FIXME: VALIDATE REGEXP
-            }else{
+            } else if ("Double".equalsIgnoreCase(type)) {
+                valid = GenericValidator.isDouble(values[i].trim());
+            } else if ("String".equalsIgnoreCase(type)) {
+                valid = GenericValidator.matchRegexp(values[i], "[a-zA-Z0-9]"); // TODO:
+                                                                                // FIXME:
+                                                                                // VALIDATE
+                                                                                // REGEXP
+            } else if ("Date".equalsIgnoreCase(type)) {
+                valid = GenericValidator.isDate(values[i].trim(),
+                        DateUtils.DATE_PATTERN, true);
+            } else if ("Point".equalsIgnoreCase(type)) {
+                valid = GenericValidator.matchRegexp(values[i], "[0-9]"); // TODO:
+                                                                          // FIXME:
+                                                                          // VALIDATE
+                                                                          // REGEXP
+            } else if ("AttributeName".equalsIgnoreCase(type)) {
+                valid = org.apache.commons.validator.GenericValidator
+                        .matchRegexp(values[i], "[a-zA-Z0-9]"); // TODO: FIXME:
+                                                                // VALIDATE
+                                                                // REGEXP
+            } else {
                 valid = false;
             }
-            if (!valid){
-                returnValue =  false;
+            if (!valid) {
+                returnValue = false;
                 break;
-            }else{
+            } else {
                 returnValue = true;
             }
         }
-        log.debug("Is valid? "+returnValue);
+        log.debug("Is valid? " + returnValue);
         return returnValue;
     }