polish

org.springframework.context/src/main/java/org/springframework/ui/binding/Binder.java

@@ -40,7 +40,7 @@ public class Binder<T> {
 
 	private TypeConverter typeConverter;
 
-	private boolean optimisticBinding = true;
+	private boolean strict = false;
 
 	private static Formatter defaultFormatter = new Formatter() {
 
@@ -75,6 +75,10 @@ public class Binder<T> {
 		expressionParser = new SpelExpressionParser(parserConfig);
 		typeConverter = new DefaultTypeConverter();
 	}
+	
+	public void setStrict(boolean strict) {
+		this.strict = strict;
+	}
 
 	public Binding add(BindingConfiguration binding) {
 		Binding newBinding;
@@ -91,12 +95,11 @@ public class Binder<T> {
 		if (propertyType == null) {
 			propertyType = formatter.getFormattedObjectType();
 		}
-		typeFormatters.put(propertyType, formatter);
-	}
-
-	public void addAnnotationBasedFormatter(Formatter<?> formatter,
-			Class<?> propertyAnnotationClass) {
-		annotationFormatters.put(propertyAnnotationClass, formatter);
+		if (propertyType.isAnnotation()) {
+			annotationFormatters.put(propertyType, formatter);
+		} else {
+			typeFormatters.put(propertyType, formatter);			
+		}
 	}
 
 	public T getModel() {
@@ -105,8 +108,8 @@ public class Binder<T> {
 
 	public Binding getBinding(String property) {
 		Binding binding = bindings.get(property);
-		if (binding == null && optimisticBinding) {
-			return add(new BindingConfiguration(property, null, false));
+		if (binding == null && !strict) {
+			return add(new BindingConfiguration(property, null));
 		} else {
 			return binding;
 		}
@@ -133,13 +136,10 @@ public class Binder<T> {
 
 		private Formatter formatter;
 
-		private boolean required;
-
 		public BindingImpl(BindingConfiguration config)
 				throws org.springframework.expression.ParseException {
 			property = expressionParser.parseExpression(config.getProperty());
 			formatter = config.getFormatter();
-			required = config.isRequired();
 		}
 
 		public String getValue() {
@@ -198,10 +198,6 @@ public class Binder<T> {
 			setValue(values);			
 		}
 
-		public boolean isRequired() {
-			return required;
-		}
-
 		public BindingFailures getFailures() {
 			return null;
 		}

org.springframework.context/src/main/java/org/springframework/ui/binding/BindingConfiguration.java

@@ -8,12 +8,9 @@ public class BindingConfiguration {
 	
 	private Formatter<?> formatter;
 	
-	private boolean required;
-	
-	public BindingConfiguration(String property, Formatter<?> formatter, boolean required) {
+	public BindingConfiguration(String property, Formatter<?> formatter) {
 		this.property = property;
 		this.formatter = formatter;
-		this.required = required;
 	}
 
 	public String getProperty() {
@@ -24,8 +21,4 @@ public class BindingConfiguration {
 		return formatter;
 	}
 
-	public boolean isRequired() {
-		return required;
-	}
-	
 }