Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r8504902fdc35fe05888f3ddfee97c9641a235143 -ree8be67b9e8421f8423d88f4e5f943aa0b07ee42 Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java =================================================================== diff -u -r6c926be53df614ac2169297a8c5fb16147fb1ae9 -ree8be67b9e8421f8423d88f4e5f943aa0b07ee42 --- lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java (.../FileValidatorUtil.java) (revision 6c926be53df614ac2169297a8c5fb16147fb1ae9) +++ lams_common/src/java/org/lamsfoundation/lams/util/FileValidatorUtil.java (.../FileValidatorUtil.java) (revision ee8be67b9e8421f8423d88f4e5f943aa0b07ee42) @@ -91,8 +91,8 @@ } boolean largeFile = Boolean.valueOf(field.getVarValue(LARGE_FILE)).booleanValue(); - - return validateFileSize(fileSize, largeFile, errors); + //so far put message into GLOABLE_MESSAGE rather than special key + return validateFileSize(fileSize, largeFile, ActionMessages.GLOBAL_MESSAGE , errors); } /** * @@ -102,19 +102,32 @@ * @return Be careful, if the file size is under maximum size, return TRUE. Otherwise, return false. */ public static boolean validateFileSize(FormFile file, boolean largeFile, ActionMessages errors){ - int fileSize = 0; - try { - fileSize = file.getFileSize(); - } catch (Exception e) { - //skip, do nothing - return true; - } - - return validateFileSize(fileSize, largeFile, errors); + return validateFileSize(file, largeFile,ActionMessages.GLOBAL_MESSAGE, errors); } - private static boolean validateFileSize(int fileSize, boolean largeFile, ActionMessages errors){ + /** + * + * @param file + * @param largeFile + * @param errorKey the key in ActionMessages(errorKey,ActionMessage()); + * @param errors + * @return Be careful, if the file size is under maximum size, return TRUE. Otherwise, return false. + */ + public static boolean validateFileSize(FormFile file, boolean largeFile, String errorKey, ActionMessages errors){ + int fileSize = 0; + try { + fileSize = file.getFileSize(); + } catch (Exception e) { + //skip, do nothing + return true; + } + + return validateFileSize(fileSize, largeFile,errorKey, errors); + + } + + private static boolean validateFileSize(int fileSize, boolean largeFile, String errorKey, ActionMessages errors){ float maxFileSize; //whether we are using large file or not? @@ -139,7 +152,7 @@ String maxSize = format.format(maxFileSize) + unit; //set error message - errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(MSG_KEY,maxSize)); + errors.add(errorKey, new ActionMessage(MSG_KEY,maxSize)); return false; } return true;