removed general purpose validation stuff and moved

to mir.session.Validation*

diff --git a/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java b/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
index 8b55a30..ebd7e48 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicArticlePostingHandler.java
@@ -44,6 +44,8 @@ import mir.session.Session;
 import mir.session.SessionExc;\r
 import mir.session.SessionFailure;\r
 import mir.session.UploadedFile;\r
+import mir.session.ValidationError;\r
+import mir.session.ValidationHelper;\r
 import mir.util.ExceptionFunctions;\r
 import mircoders.entity.EntityContent;\r
 import mircoders.global.MirGlobal;\r
@@ -94,10 +96,10 @@ public class MirBasicArticlePostingHandler extends MirBasicPostingSessionHandler
   public void validate(List aResults, Request aRequest, Session aSession) throws SessionExc, SessionFailure {\r
     super.validate(aResults, aRequest, aSession);\r
 \r
-    testFieldEntered(aRequest, "title", "validationerror.missing", aResults);\r
-    testFieldEntered(aRequest, "description", "validationerror.missing", aResults);\r
-    testFieldEntered(aRequest, "creator", "validationerror.missing", aResults);\r
-    testFieldEntered(aRequest, "content_data", "validationerror.missing", aResults);\r
+    ValidationHelper.testFieldEntered(aRequest, "title", "validationerror.missing", aResults);\r
+    ValidationHelper.testFieldEntered(aRequest, "description", "validationerror.missing", aResults);\r
+    ValidationHelper.testFieldEntered(aRequest, "creator", "validationerror.missing", aResults);\r
+    ValidationHelper.testFieldEntered(aRequest, "content_data", "validationerror.missing", aResults);\r
   }\r
 \r
   public void finalizeArticle(Request aRequest, Session aSession, EntityContent anArticle) throws SessionExc, SessionFailure {\r
@@ -192,4 +194,4 @@ public class MirBasicArticlePostingHandler extends MirBasicPostingSessionHandler
     logger.info("article posted");\r
   };\r
 \r
-}
\ No newline at end of file
+}\r

diff --git a/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java b/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
index 7707dff..eda64b4 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicCommentPostingHandler.java
@@ -41,6 +41,8 @@ import mir.session.Session;
 import mir.session.SessionExc;
 import mir.session.SessionFailure;
 import mir.session.UploadedFile;
+import mir.session.ValidationError;
+import mir.session.ValidationHelper;
 import mir.util.ExceptionFunctions;
 import mircoders.entity.EntityComment;
 import mircoders.global.MirGlobal;
@@ -89,9 +91,9 @@ public class MirBasicCommentPostingHandler extends MirBasicPostingSessionHandler
   public void validate(List aResults, Request aRequest, Session aSession) throws SessionExc, SessionFailure {
     super.validate(aResults, aRequest, aSession);
 
-    testFieldEntered(aRequest, "title", "validationerror.missing", aResults);
-    testFieldEntered(aRequest, "description", "validationerror.missing", aResults);
-    testFieldEntered(aRequest, "creator", "validationerror.missing", aResults);
+    ValidationHelper.testFieldEntered(aRequest, "title", "validationerror.missing", aResults);
+    ValidationHelper.testFieldEntered(aRequest, "description", "validationerror.missing", aResults);
+    ValidationHelper.testFieldEntered(aRequest, "creator", "validationerror.missing", aResults);
   }
 
   protected void initializeSession(Request aRequest, Session aSession) throws SessionExc, SessionFailure {
@@ -166,4 +168,4 @@ public class MirBasicCommentPostingHandler extends MirBasicPostingSessionHandler
       super(aMessage);
     }
   }
-}
\ No newline at end of file
+}

diff --git a/source/mircoders/localizer/basic/MirBasicPostingSessionHandler.java b/source/mircoders/localizer/basic/MirBasicPostingSessionHandler.java
index 08a7f57..ed0a12d 100755 (executable)
--- a/source/mircoders/localizer/basic/MirBasicPostingSessionHandler.java
+++ b/source/mircoders/localizer/basic/MirBasicPostingSessionHandler.java
@@ -29,7 +29,6 @@
  */
 package mircoders.localizer.basic;
 
-import java.util.Arrays;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.List;
@@ -46,6 +45,8 @@ import mir.session.SessionExc;
 import mir.session.SessionFailure;
 import mir.session.SessionHandler;
 import mir.session.UploadedFile;
+import mir.session.ValidationError;
+import mir.session.ValidationHelper;
 import mir.storage.StorageObject;
 import mir.util.ExceptionFunctions;
 import mircoders.global.MirGlobal;
@@ -258,116 +259,6 @@ public abstract class MirBasicPostingSessionHandler implements SessionHandler {
     }
   }
 
-  /**
-   * Class that represents a validation error
-   *
-   * <p>Title: </p>
-   * <p>Description: </p>
-   * <p>Copyright: Copyright (c) 2003</p>
-   * <p>Company: </p>
-   * @author not attributable
-   * @version 1.0
-   */
-
-  public class ValidationError {
-    private String field;
-    private String message;
-    private List parameters;
-
-    public ValidationError(String aField, String aMessage) {
-      this (aField, aMessage, new String[] {});
-    }
-
-    public ValidationError(String aField, String aMessage, Object aParameter) {
-      this (aField, aMessage, new Object[] {aParameter});
-    }
-
-    public ValidationError(String aField, String aMessage, Object[] aParameters) {
-      field = aField;
-      message = aMessage;
-      parameters = Arrays.asList(aParameters);
-    }
-
-    public String getMessage() {
-      return message;
-    }
-
-    public String getField() {
-      return field;
-    }
-
-    public List getParameters() {
-      return parameters;
-    }
-  }
-
-  /**
-   * Convenience validation method to test wether a field has been filled in
-   *
-   * @param aRequest
-   * @param aFieldName
-   * @param anErrorMessageResource
-   * @param aValidationResults
-   * @return
-   */
-
-  protected boolean testFieldEntered(Request aRequest, String aFieldName, String anErrorMessageResource, List aValidationResults) {
-    Object value = aRequest.getParameter(aFieldName);
-    if (value==null || !(value instanceof String) || ((String) value).trim().length()==0) {
-      aValidationResults.add(new ValidationError(aFieldName, anErrorMessageResource));
-      return false;
-    }
-    else
-      return true;
-  }
-
-  /**
-   * Convenience validation method to test wether a field is numeric
-
-   * @param aRequest
-   * @param aFieldName
-   * @param anErrorMessageResource
-   * @param aValidationResults
-   * @return
-   */
-
-  protected boolean testFieldIsNumeric(Request aRequest, String aFieldName, String anErrorMessageResource, List aValidationResults) {
-    Object value = aRequest.getParameter(aFieldName);
-    if (value!=null) {
-      try {
-        Integer.parseInt((String) value);
-        return true;
-      }
-      catch (Throwable t) {
-        aValidationResults.add(new ValidationError(aFieldName, anErrorMessageResource));
-        return false;
-      }
-    }
-    return true;
-  }
-
-  /**
-   * Convenience validation method to test wether a field is numeric
-
-   * @param aRequest
-   * @param aFieldName
-   * @param anErrorMessageResource
-   * @param aValidationResults
-   * @return
-   */
-
-  protected boolean testFieldLength(Request aRequest, String aFieldName, int aMaxLength, String anErrorMessageResource, List aValidationResults) {
-    String value = aRequest.getParameter(aFieldName);
-
-    if (value!=null) {
-      if (value.length()>aMaxLength) {
-        aValidationResults.add(new ValidationError(aFieldName, anErrorMessageResource));
-        return false;
-      }
-      else return true;
-    }
-    return true;
-  }
 
   /**
    * Method to generate a one-time password