Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java?rev=815493&r1=815492&r2=815493&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/validation/validator/AbstractValidator.java Tue Sep 15 21:15:57 2009 @@ -20,7 +20,6 @@ import java.util.Map; import org.apache.wicket.IClusterable; -import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.util.lang.Classes; import org.apache.wicket.validation.INullAcceptingValidator; import org.apache.wicket.validation.IValidatable; @@ -203,83 +202,4 @@ final Map<String, Object> resourceModel = new HashMap<String, Object>(1); return resourceModel; } - - // deprecated methods - - /** - * DEPRECATED/UNSUPPORTED - * - * Gets the default variables for interpolation. These are: - * <ul> - * <li>${input}: the user's input</li> - * <li>${name}: the name of the component</li> - * <li>${label}: the label of the <code>Component</code> - either comes from - * <code>FormComponent.labelModel - * </code> or resource key [form-id].[form-component-id] in that order</li> - * </ul> - * - * @param formComponent - * form component - * @return a map with the variables for interpolation - * - * @deprecated use {...@link #variablesMap(IValidatable)} instead - * @throws UnsupportedOperationException - * - * - * FIXME 2.0: remove asap - */ - @Deprecated - protected final Map<String, Object> messageModel(final FormComponent<T> formComponent) - { - throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC"); - } - - /** - * DEPRECATED/UNSUPPORTED - * - * Gets the resource key for validator's error message from the ApplicationSettings class. - * - * @param formComponent - * form component that is being validated - * - * @return the resource key based on the form component - * - * @deprecated use {...@link #resourceKey()} instead - * @throws UnsupportedOperationException - * - * - * FIXME 2.0: remove asap - * - */ - @Deprecated - protected final String resourceKey(final FormComponent<T> formComponent) - { - throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC"); - } - - /** - * DEPRECATED/UNSUPPORTED - * - * THIS METHOD IS NOT PART OF THE WICKET PUBLIC API. DO NOT IMPLEMENT IT. - * <p> - * Instead of subclassing IValidator, you should use one of the existing validators, which cover - * a huge number of cases, or if none satisfies your need, subclass AbstractValidator. - * <p> - * Validates the given input. The input corresponds to the input from the request for a - * component. - * - * @param component - * Component to validate - * - * @deprecated use {...@link #variablesMap(IValidatable)} instead - * @throws UnsupportedOperationException - * - * - * FIXME 2.0: remove asap - */ - @Deprecated - public final void validate(final FormComponent<T> component) - { - throw new UnsupportedOperationException("THIS METHOD IS DEPRECATED, SEE JAVADOC"); - } }
Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java?rev=815493&r1=815492&r2=815493&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelDetachTest.java Tue Sep 15 21:15:57 2009 @@ -50,11 +50,10 @@ /** * Performs the nested test for BoundCompoundPropertyModel. */ - @SuppressWarnings("deprecation") public void testBoundCompoundPropertyModelDetach() { Detachable detachable = new Detachable(); - IModel<Detachable> model = new BoundCompoundPropertyModel<Detachable>(detachable); + IModel<Detachable> model = new CompoundPropertyModel<Detachable>(detachable); model.detach(); assertTrue(detachable.detached); } Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java?rev=815493&r1=815492&r2=815493&view=diff ============================================================================== --- wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java (original) +++ wicket/trunk/wicket/src/test/java/org/apache/wicket/model/ModelToStringTest.java Tue Sep 15 21:15:57 2009 @@ -18,9 +18,7 @@ import java.util.Properties; -import org.apache.wicket.Component; import org.apache.wicket.WicketTestCase; -import org.apache.wicket.markup.html.basic.Label; /** @@ -91,36 +89,29 @@ /** * Tests the BoundCompoundPropertyModel.toString() method. */ - @SuppressWarnings("deprecation") public void testBoundCompoundPropertyModel() { - BoundCompoundPropertyModel<String> emptyModel = new BoundCompoundPropertyModel<String>(""); - String expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[]:bindings=[]"; + CompoundPropertyModel<String> emptyModel = new CompoundPropertyModel<String>(""); + String expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[]"; assertEquals(expected, emptyModel.toString()); Properties properties = new Properties(); properties.put("name", "foo"); - BoundCompoundPropertyModel<String> stringProperty = new BoundCompoundPropertyModel<String>( - properties); + CompoundPropertyModel<String> stringProperty = new CompoundPropertyModel<String>(properties); - expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[{name=foo}]:bindings=[]"; + expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[{name=foo}]"; assertEquals(expected, stringProperty.toString()); stringProperty.getObject(); - expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[{name=foo}]:bindings=[]"; + expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[{name=foo}]"; assertEquals(expected, stringProperty.toString()); InnerPOJO innerPOJO = new InnerPOJO(); - BoundCompoundPropertyModel<InnerPOJO> pojoProperty = new BoundCompoundPropertyModel<InnerPOJO>( + CompoundPropertyModel<InnerPOJO> pojoProperty = new CompoundPropertyModel<InnerPOJO>( innerPOJO); - expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" + - innerPOJO + "]:bindings=[]"; - assertEquals(expected, pojoProperty.toString()); - - Component component1 = pojoProperty.bind(new Label("label")); - expected = "Model:classname=[org.apache.wicket.model.BoundCompoundPropertyModel]:nestedModel=[" + - innerPOJO + "]:bindings=[Binding(:component=[" + component1 + "]:expression=[label])]"; + expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[" + + innerPOJO + "]"; assertEquals(expected, pojoProperty.toString()); }
