Revision: 1524
http://svn.sourceforge.net/spring-rich-c/?rev=1524&view=rev
Author: mathiasbr
Date: 2006-10-20 01:11:38 -0700 (Fri, 20 Oct 2006)
Log Message:
-----------
patch for RCP-423
raiseValidationMessage and clearValidationMessage methods added to
ValidatingFormModel
Modified Paths:
--------------
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/form/ValidatingFormModel.java
trunk/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultFormModel.java
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
Modified:
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/form/ValidatingFormModel.java
===================================================================
---
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/form/ValidatingFormModel.java
2006-10-19 20:15:59 UTC (rev 1523)
+++
trunk/spring-richclient/binding/src/main/java/org/springframework/binding/form/ValidatingFormModel.java
2006-10-20 08:11:38 UTC (rev 1524)
@@ -15,6 +15,7 @@
*/
package org.springframework.binding.form;
+import org.springframework.binding.validation.ValidationMessage;
import org.springframework.binding.validation.ValidationResultsModel;
import org.springframework.binding.validation.Validator;
@@ -68,4 +69,22 @@
*/
public void setValidator(Validator validator);
+ /**
+ * Provide validation messages that are generated by
+ * a process separate from the standard Validator.
+ * <p>
+ * All error messages that are raised using this method must be cleared
using the
+ * method @link #cleanValdationMessage(ValidationMessage) before the form
model
+ * can be commited.
+ * @param validationMessage the message to raise
+ */
+ void raiseValidationMessage(ValidationMessage validationMessage);
+
+ /**
+ * Clear validation messages that are generated by
+ * a process separate from the standard Validator.
+ * @param validationMessage the message to clear
+ */
+ void clearValidationMessage(ValidationMessage validationMessage);
+
}
\ No newline at end of file
Modified:
trunk/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultFormModel.java
===================================================================
---
trunk/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultFormModel.java
2006-10-19 20:15:59 UTC (rev 1523)
+++
trunk/spring-richclient/support/src/main/java/org/springframework/binding/form/support/DefaultFormModel.java
2006-10-20 08:11:38 UTC (rev 1524)
@@ -238,28 +238,14 @@
}
}
- /**
- * Allows subclasses to provide validation messages that are generated by
- * a process separate from the standard Validator.
- * <p>
- * All error messages that are raised using this method must be cleared
using the
- * method @link #cleanValdationMessage(ValidationMessage) before the form
model
- * can be commited.
- * @param validationMessage the message to raise
- */
- protected void raiseValidationMessage(ValidationMessage validationMessage)
{
+ public void raiseValidationMessage(ValidationMessage validationMessage) {
additionalValidationResults.addMessage(validationMessage);
if (isValidating()) {
validationResultsModel.addMessage(validationMessage);
}
}
- /**
- * Allows subclasses to clear validation messages that are generated by
- * a process separate from the standard Validator.
- * @param validationMessage the message to clear
- */
- protected void clearValidationMessage(ValidationMessage validationMessage)
{
+ public void clearValidationMessage(ValidationMessage validationMessage) {
additionalValidationResults.removeMessage(validationMessage);
if (isValidating()) {
validationResultsModel.removeMessage(validationMessage);
Modified:
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
===================================================================
---
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
2006-10-19 20:15:59 UTC (rev 1523)
+++
trunk/spring-richclient/support/src/test/java/org/springframework/binding/form/support/DefaultFormModelTests.java
2006-10-20 08:11:38 UTC (rev 1524)
@@ -45,7 +45,7 @@
*/
public class DefaultFormModelTests extends AbstractFormModelTests {
- protected AbstractFormModel getFormModel(Object formObject) {
+ protected DefaultFormModel getFormModel(Object formObject) {
return new TestDefaultFormModel(formObject);
}
@@ -54,7 +54,7 @@
}
public void testPropertyChangeCausesValidation() {
- DefaultFormModel fm = (DefaultFormModel) getFormModel(new TestBean());
+ DefaultFormModel fm = getFormModel(new TestBean());
TestValidator v = new TestValidator();
fm.setValidator(v);
TestConversionService cs = new TestConversionService();
@@ -81,7 +81,7 @@
}
public void testValidationMessages() {
- TestDefaultFormModel fm = new TestDefaultFormModel(new TestBean());
+ DefaultFormModel fm = getFormModel(new TestBean());
ValidationResultsModel r = fm.getValidationResults();
TestValidator v = new TestValidator();
fm.setValidator(v);
@@ -120,7 +120,7 @@
}
public void testRaiseClearValidationMessage() {
- TestDefaultFormModel fm = (TestDefaultFormModel) getFormModel(new
TestBean());
+ DefaultFormModel fm = getFormModel(new TestBean());
ValidationResultsModel r = fm.getValidationResults();
TestValidator v = new TestValidator();
fm.setValidator(v);
@@ -148,12 +148,12 @@
assertEquals(3, v.count);
assertEquals(2, r.getMessageCount());
- fm.clearValdationMessage(message1);
+ fm.clearValidationMessage(message1);
assertEquals(1, r.getMessageCount());
}
public void testChangingValidatingClearsMessagesOrValidates() {
- DefaultFormModel fm = (DefaultFormModel) getFormModel(new TestBean());
+ DefaultFormModel fm = getFormModel(new TestBean());
ValidationResultsModel r = fm.getValidationResults();
TestValidator v = new TestValidator();
v.results = getValidationResults("message1");
@@ -196,7 +196,7 @@
public void testSetThrowsExceptionRaisesValidationMessage() {
final ErrorBean errorBean = new ErrorBean();
- DefaultFormModel fm = (DefaultFormModel) getFormModel(errorBean);
+ DefaultFormModel fm = getFormModel(errorBean);
final ValueModel vm = fm.getValueModel("error");
vm.setValue("test");
@@ -208,7 +208,7 @@
}
public void testTypeConversionThrowsExceptionRaisesValidationMessage() {
- DefaultFormModel fm = (DefaultFormModel) getFormModel(new TestBean());
+ DefaultFormModel fm = getFormModel(new TestBean());
TestConversionService cs = new TestConversionService();
cs.executer = new ConversionExecutor(String.class, Integer.class, new
ExceptionConverter(String.class,
Integer.class));
@@ -221,7 +221,7 @@
public void testValidatingEvents() {
TestPropertyChangeListener pcl = new
TestPropertyChangeListener(ValidatingFormModel.VALIDATING_PROPERTY);
- DefaultFormModel fm = (DefaultFormModel) getFormModel(new TestBean());
+ DefaultFormModel fm = getFormModel(new TestBean());
fm.addPropertyChangeListener(ValidatingFormModel.VALIDATING_PROPERTY,
pcl);
assertTrue(fm.isEnabled());
@@ -241,7 +241,7 @@
assertTrue(fm.isValidating());
assertEquals(2, pcl.eventCount());
}
-
+
public void testReadOnlyRevert() {
FormModel fm = getFormModel(new TestBean());
fm.getValueModel("readOnly");
@@ -315,14 +315,6 @@
});
}
-
- public void raiseValidationMessage(ValidationMessage
validationMessage) {
- super.raiseValidationMessage(validationMessage);
- }
-
- public void clearValdationMessage(ValidationMessage validationMessage)
{
- super.clearValidationMessage(validationMessage);
- }
}
private static class ExceptionConverter implements Converter {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
spring-rich-c-cvs mailing list
spring-rich-c-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/spring-rich-c-cvs
