[Springframework-cvs] spring/src/org/springframework/web/servlet/mvc BaseCommandController.java,1.37.2.1,1.37.2.2

[Juergen H. <jho...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/web/servlet/mvc
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv19629/src/org/springframework/web/servlet/mvc

Modified Files:
      Tag: mbranch-1-2
	BaseCommandController.java 
Log Message:
backported fixes and enhancements from 2.0 M4 (HEAD)

Index: BaseCommandController.java
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/web/servlet/mvc/BaseCommandController.java,v
retrieving revision 1.37.2.1
retrieving revision 1.37.2.2
diff -C2 -d -r1.37.2.1 -r1.37.2.2
*** BaseCommandController.java	17 Jan 2006 21:29:36 -0000	1.37.2.1
--- BaseCommandController.java	21 Apr 2006 00:13:50 -0000	1.37.2.2
***************
*** 5,11 ****
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  * 
   *      http://www.apache.org/licenses/LICENSE-2.0
!  * 
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
--- 5,11 ----
   * you may not use this file except in compliance with the License.
   * You may obtain a copy of the License at
!  *
   *      http://www.apache.org/licenses/LICENSE-2.0
!  *
   * Unless required by applicable law or agreed to in writing, software
   * distributed under the License is distributed on an "AS IS" BASIS,
***************
*** 183,201 ****
  
  	/**
- 	 * Set the Validators for this controller.
- 	 * The Validator must support the specified command class.
- 	 */
- 	public final void setValidators(Validator[] validators) {
- 		this.validators = validators;
- 	}
- 
- 	/**
- 	 * Return the Validators for this controller.
- 	 */
- 	public final Validator[] getValidators() {
- 		return validators;
- 	}
- 
- 	/**
  	 * Set the primary Validator for this controller. The Validator
  	 * must support the specified command class. If there are one
--- 183,186 ----
***************
*** 216,219 ****
--- 201,219 ----
  
  	/**
+ 	 * Set the Validators for this controller.
+ 	 * The Validator must support the specified command class.
+ 	 */
+ 	public final void setValidators(Validator[] validators) {
+ 		this.validators = validators;
+ 	}
+ 
+ 	/**
+ 	 * Return the Validators for this controller.
+ 	 */
+ 	public final Validator[] getValidators() {
+ 		return validators;
+ 	}
+ 
+ 	/**
  	 * Set if the Validator should get applied when binding.
  	 */
***************
*** 268,275 ****
  
  	/**
! 	 * Specify one or more PropertyEditorRegistrars to be applied
  	 * to every DataBinder that this controller uses.
  	 * <p>Allows for factoring out the registration of PropertyEditors
! 	 * to separate objects, as alternative to <code>initBinder</code>.
  	 * @see #initBinder
  	 */
--- 268,286 ----
  
  	/**
! 	 * Specify a single PropertyEditorRegistrar to be applied
  	 * to every DataBinder that this controller uses.
  	 * <p>Allows for factoring out the registration of PropertyEditors
! 	 * to separate objects, as an alternative to <code>initBinder</code>.
! 	 * @see #initBinder
! 	 */
! 	public final void setPropertyEditorRegistrar(PropertyEditorRegistrar propertyEditorRegistrar) {
! 		this.propertyEditorRegistrars = new PropertyEditorRegistrar[] {propertyEditorRegistrar};
! 	}
! 
! 	/**
! 	 * Specify multiple PropertyEditorRegistrars to be applied
! 	 * to every DataBinder that this controller uses.
! 	 * <p>Allows for factoring out the registration of PropertyEditors
! 	 * to separate objects, as an alternative to <code>initBinder</code>.
  	 * @see #initBinder
  	 */