--- a/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Mon Apr 18 09:34:18 2011 +0000
+++ b/flys-artifacts/src/main/java/de/intevation/flys/artifacts/FLYSArtifact.java	Mon Apr 18 12:36:08 2011 +0000
@@ -33,6 +33,7 @@
 
 import de.intevation.flys.artifacts.context.FLYSContext;
 import de.intevation.flys.artifacts.model.RiverFactory;
+import de.intevation.flys.artifacts.states.DefaultState;
 
 
 /**
@@ -161,14 +162,12 @@
         doc.appendChild(result);
 
         try {
-            saveData(target, XPATH_FEED_INPUT);
+            saveData(target, XPATH_FEED_INPUT, context);
             return describe(target, context);
         }
         catch (IllegalArgumentException iae) {
             creator.addAttr(result, "type", OPERATION_FAILED, true);
 
-            // TODO I18N this message - getMessage() returns a lookup string, no
-            // human readable error message
             result.setTextContent(iae.getMessage());
         }
 
@@ -324,7 +323,7 @@
      * @param feed The FEED document.
      * @param xpath The XPath that points to the data nodes.
      */
-    public void saveData(Document feed, String xpath)
+    public void saveData(Document feed, String xpath, CallContext context)
     throws IllegalArgumentException
     {
         if (feed == null || xpath == null || xpath.length() == 0) {
@@ -355,10 +354,14 @@
             if (name != null && value != null) {
                 logger.debug("Save data item for '" + name + "' : " + value);
 
-                // TODO ADD INPUT VALIDATION!
                 addData(name, new DefaultStateData(name, null, null, value));
             }
         }
+
+        State current           = getCurrentState(context);
+        DefaultState toValidate = (DefaultState) fillState(current);
+
+        toValidate.validate(this, context);
     }