diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/Binder.java b/org.springframework.context/src/main/java/org/springframework/ui/binding/Binder.java index 3ebc31fda6f..84b0a257c75 100644 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/Binder.java +++ b/org.springframework.context/src/main/java/org/springframework/ui/binding/Binder.java @@ -23,8 +23,20 @@ import java.util.Map; * @since 3.0 * @see #bind(Map) */ -public interface Binder extends BindingFactory { +public interface Binder { + /** + * The model object for which property bindings may be accessed. + */ + Object getModel(); + + /** + * Get a binding to a model property.. + * @param property the property path + * @throws NoSuchBindingException if no binding to the property exists + */ + Binding getBinding(String property); + /** * Bind the source values to the properties of the model. * A result is returned for each registered {@link Binding}. diff --git a/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingFactory.java b/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingFactory.java deleted file mode 100644 index 1d7cefecabf..00000000000 --- a/org.springframework.context/src/main/java/org/springframework/ui/binding/BindingFactory.java +++ /dev/null @@ -1,37 +0,0 @@ -/* - * Copyright 2004-2009 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * 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, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.springframework.ui.binding; - -/** - * A factory for model property bindings. - * @author Keith Donald - * @since 3.0 - */ -public interface BindingFactory { - - /** - * The model object for which property bindings may be accessed. - */ - Object getModel(); - - /** - * Get a binding to a model property.. - * @param property the property path - * @throws NoSuchBindingException if no binding to the property exists - */ - Binding getBinding(String property); - -} \ No newline at end of file diff --git a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java index a81a09885ae..0cb562487f8 100644 --- a/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java +++ b/org.springframework.context/src/test/java/org/springframework/ui/binding/support/GenericBinderTests.java @@ -260,10 +260,11 @@ public class GenericBinderTests { @Test public void bindToListSingleString() { - binder.addBinding("addresses").formatWith(new AddressListFormatter()); + binder.addBinding("addresses"); + binder.registerFormatter(new GenericCollectionPropertyType(List.class, Address.class), new AddressListFormatter()); Map values = new LinkedHashMap(); values.put("addresses", "4655 Macy Lane:Melbourne:FL:35452,1234 Rostock Circle:Palm Bay:FL:32901,1977 Bel Aire Estates:Coker:AL:12345"); - BindingResults results = binder.bind(values); + binder.bind(values); Assert.assertEquals(3, bean.addresses.size()); assertEquals("4655 Macy Lane", bean.addresses.get(0).street); assertEquals("Melbourne", bean.addresses.get(0).city);