Author: gseitz Date: Mon May 19 23:36:28 2008 New Revision: 658120 URL: http://svn.apache.org/viewvc?rev=658120&view=rev Log: generics cleanup
Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java wicket/trunk/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IObjectClassAwareModel.java wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractPropertyModel.java Mon May 19 23:36:28 2008 @@ -144,6 +144,7 @@ * The object that will be used when setting a value on the model object * @see IModel#setObject(T) */ + @SuppressWarnings("unchecked") public void setObject(T object) { final String expression = propertyExpression(); @@ -153,7 +154,7 @@ // why not just set the target to the object? if (target instanceof IModel) { - ((IModel)target).setObject(object); + ((IModel<T>)target).setObject(object); } else { @@ -189,7 +190,7 @@ Object object = target; while (object instanceof IModel) { - Object tmp = ((IModel)object).getObject(); + Object tmp = ((IModel<?>)object).getObject(); if (tmp == object) break; object = tmp; @@ -307,7 +308,7 @@ * @deprecated use [EMAIL PROTECTED] #getObject()} instead */ @Deprecated - protected final Object onGetObject(Component component) + protected final Object onGetObject(Component<?> component) { throw new UnsupportedOperationException(); } @@ -320,7 +321,7 @@ * @deprecated use [EMAIL PROTECTED] #setObject(Object)} instead */ @Deprecated - protected final void onSetObject(Component component, Object object) + protected final void onSetObject(Component<?> component, Object object) { throw new UnsupportedOperationException(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/AbstractReadOnlyModel.java Mon May 19 23:36:28 2008 @@ -78,11 +78,11 @@ // release. /** * @param component - * @return + * @return the model object * @deprecated replace by [EMAIL PROTECTED] IModel#getObject()}. */ @Deprecated - public final Object getObject(Component component) + public final Object getObject(Component<?> component) { throw new UnsupportedOperationException(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/CompoundPropertyModel.java Mon May 19 23:36:28 2008 @@ -56,11 +56,12 @@ /** * @see org.apache.wicket.model.IModel#getObject() */ + @SuppressWarnings("unchecked") public T getObject() { if (target instanceof IModel) { - return (T)((IModel)target).getObject(); + return ((IModel<T>)target).getObject(); } return (T)target; } @@ -68,11 +69,12 @@ /** * @see org.apache.wicket.model.IModel#setObject(java.lang.Object) */ + @SuppressWarnings("unchecked") public void setObject(T object) { if (target instanceof IModel) { - ((IModel)target).setObject(object); + ((IModel<T>)target).setObject(object); } else { @@ -83,11 +85,11 @@ /** * @see org.apache.wicket.model.IChainingModel#getChainedModel() */ - public IModel< ? > getChainedModel() + public IModel<?> getChainedModel() { if (target instanceof IModel) { - return (IModel)target; + return (IModel<?>)target; } return null; } @@ -95,7 +97,7 @@ /** * @see org.apache.wicket.model.IChainingModel#setChainedModel(org.apache.wicket.model.IModel) */ - public void setChainedModel(IModel< ? > model) + public void setChainedModel(IModel<?> model) { target = model; } @@ -117,7 +119,7 @@ * @param component * @return property expression that should be used against the target object */ - protected String propertyExpression(Component< ? > component) + protected String propertyExpression(Component<?> component) { return component.getId(); } @@ -137,10 +139,12 @@ * * @param property * @return The IModel that is a wrapper around the current model and the property + * @param <S> + * the type of the property */ - public <P> IModel<P> bind(String property) + public <S> IModel<S> bind(String property) { - return new PropertyModel<P>(this, property); + return new PropertyModel<S>(this, property); } /** @@ -148,6 +152,8 @@ * the model get * * @author ivaynberg + * @param <C> + * The model object type */ private class AttachedCompoundPropertyModel<C> extends AbstractPropertyModel<C> implements @@ -213,11 +219,11 @@ // deprecation release. /** * @param component - * @return + * @return the model object * @deprecated replace by [EMAIL PROTECTED] IModel#getObject()}. */ @Deprecated - public final Object getObject(Component component) + public final Object getObject(Component<?> component) { throw new UnsupportedOperationException(); } @@ -228,7 +234,7 @@ * @deprecated replace by [EMAIL PROTECTED] IModel#setObject(Object)}. */ @Deprecated - public final void setObject(Component component, Object object) + public final void setObject(Component<?> component, Object object) { throw new UnsupportedOperationException(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IComponentInheritedModel.java Mon May 19 23:36:28 2008 @@ -33,12 +33,16 @@ * * @author jcompagner * @author Igor Vaynberg (ivaynberg) + * @param <T> + * The model object type */ public interface IComponentInheritedModel<T> extends IModel<T> { /** + * @param <W> + * the model object type of the wrapped model * @param component * @return The WrapModel that wraps this model */ - <P> IWrapModel<P> wrapOnInheritance(Component<P> component); + <W> IWrapModel<W> wrapOnInheritance(Component<W> component); } \ No newline at end of file Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IObjectClassAwareModel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IObjectClassAwareModel.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IObjectClassAwareModel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IObjectClassAwareModel.java Mon May 19 23:36:28 2008 @@ -20,6 +20,8 @@ * Interface implemented by model that can provide class of the model object. * * @author Matej Knopp + * @param <T> + * The model object type */ public interface IObjectClassAwareModel<T> extends IModel<T> { Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/IWrapModel.java Mon May 19 23:36:28 2008 @@ -27,6 +27,8 @@ * * @author jcompagner * @author Igor Vaynberg (ivaynberg) + * @param <T> + * The model object type */ public interface IWrapModel<T> extends IModel<T> { @@ -35,5 +37,5 @@ * * @return The wrapped model */ - IModel< ? > getWrappedModel(); + IModel<?> getWrappedModel(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/Model.java Mon May 19 23:36:28 2008 @@ -214,11 +214,11 @@ // deprecation release. /** * @param component - * @return + * @return the model object * @deprecated replace by [EMAIL PROTECTED] IModel#getObject()}. */ @Deprecated - public final Object getObject(Component component) + public final Object getObject(Component<?> component) { throw new UnsupportedOperationException(); } @@ -229,7 +229,7 @@ * @deprecated replace by [EMAIL PROTECTED] IModel#setObject(Object)}. */ @Deprecated - public final void setObject(Component component, Object object) + public final void setObject(Component<?> component, Object object) { throw new UnsupportedOperationException(); } Modified: wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java URL: http://svn.apache.org/viewvc/wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java?rev=658120&r1=658119&r2=658120&view=diff ============================================================================== --- wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java (original) +++ wicket/trunk/wicket/src/main/java/org/apache/wicket/model/StringResourceModel.java Mon May 19 23:36:28 2008 @@ -82,7 +82,7 @@ * In its simplest form, the model can be used as follows: * * <pre> - * public MyPage extends WebPage<Void> + * public MyPage extends WebPage<Void> * { * public MyPage(final PageParameters parameters) * { @@ -98,7 +98,7 @@ * In this example, the resource key is selected based on the evaluation of a property expression: * * <pre> - * public MyPage extends WebPage<Void> + * public MyPage extends WebPage<Void> * { * public MyPage(final PageParameters parameters) * { @@ -126,7 +126,7 @@ * the model: * * <pre> - * public MyPage extends WebPage<Void> + * public MyPage extends WebPage<Void> * { * public MyPage(final PageParameters parameters) * { @@ -146,7 +146,7 @@ * string. This is an example of the most complex and powerful use of the string resource model: * * <pre> - * public MyPage extends WebPage<Void> + * public MyPage extends WebPage<Void> * { * public MyPage(final PageParameters parameters) * { @@ -191,13 +191,13 @@ private transient Localizer localizer; /** The wrapped model. */ - private final IModel model; + private final IModel<?> model; /** Optional parameters. */ private final Object[] parameters; /** The relative component used for lookups. */ - private Component component; + private Component<?> component; /** The key of message to get. */ private final String resourceKey; @@ -205,7 +205,7 @@ /** The default value of the message. */ private final String defaultValue; - public IWrapModel wrapOnAssignment(Component component) + public IWrapModel<String> wrapOnAssignment(Component<String> component) { return new AssignmentWrapper(component); } @@ -214,9 +214,9 @@ { private static final long serialVersionUID = 1L; - private final Component component; + private final Component<?> component; - public AssignmentWrapper(Component component) + public AssignmentWrapper(Component<?> component) { this.component = component; } @@ -264,8 +264,8 @@ * The model to use for property substitutions * @see #StringResourceModel(String, Component, IModel, Object[]) */ - public StringResourceModel(final String resourceKey, final Component component, - final IModel model) + public StringResourceModel(final String resourceKey, final Component<?> component, + final IModel<?> model) { this(resourceKey, component, model, null, null); } @@ -284,8 +284,8 @@ * * @see #StringResourceModel(String, Component, IModel, Object[]) */ - public StringResourceModel(final String resourceKey, final Component component, - final IModel model, final String defaultValue) + public StringResourceModel(final String resourceKey, final Component<?> component, + final IModel<?> model, final String defaultValue) { this(resourceKey, component, model, null, defaultValue); } @@ -312,8 +312,8 @@ * @param parameters * The parameters to substitute using a Java MessageFormat object */ - public StringResourceModel(final String resourceKey, final Component component, - final IModel model, final Object[] parameters) + public StringResourceModel(final String resourceKey, final Component<?> component, + final IModel<?> model, final Object[] parameters) { this(resourceKey, component, model, parameters, null); } @@ -342,8 +342,8 @@ * @param defaultValue * The default value if the resource key is not found. */ - public StringResourceModel(final String resourceKey, final Component component, - final IModel model, final Object[] parameters, final String defaultValue) + public StringResourceModel(final String resourceKey, final Component<?> component, + final IModel<?> model, final Object[] parameters, final String defaultValue) { if (resourceKey == null) { @@ -365,7 +365,7 @@ * The model to use for property substitutions * @see #StringResourceModel(String, Component, IModel, Object[]) */ - public StringResourceModel(final String resourceKey, final IModel model) + public StringResourceModel(final String resourceKey, final IModel<?> model) { this(resourceKey, null, model, null, null); } @@ -382,7 +382,7 @@ * * @see #StringResourceModel(String, Component, IModel, Object[]) */ - public StringResourceModel(final String resourceKey, final IModel model, + public StringResourceModel(final String resourceKey, final IModel<?> model, final String defaultValue) { this(resourceKey, null, model, null, defaultValue); @@ -403,7 +403,7 @@ * @param parameters * The parameters to substitute using a Java MessageFormat object */ - public StringResourceModel(final String resourceKey, final IModel model, + public StringResourceModel(final String resourceKey, final IModel<?> model, final Object[] parameters) { this(resourceKey, null, model, parameters, null); @@ -426,7 +426,7 @@ * @param defaultValue * The default value if the resource key is not found. */ - public StringResourceModel(final String resourceKey, final IModel model, + public StringResourceModel(final String resourceKey, final IModel<?> model, final Object[] parameters, final String defaultValue) { this(resourceKey, null, model, parameters, defaultValue); @@ -495,7 +495,7 @@ { if (parameters[i] instanceof IModel) { - realParams[i] = ((IModel)parameters[i]).getObject(); + realParams[i] = ((IModel<?>)parameters[i]).getObject(); } else if (model != null && parameters[i] instanceof String) {