Updated Branches: refs/heads/master 84e71742a -> a92efff89
WICKET-4963 complete generification of ComponentModel Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/a92efff8 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/a92efff8 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/a92efff8 Branch: refs/heads/master Commit: a92efff897f7b845b3932ab3ed600a7f668005b0 Parents: 84e7174 Author: svenmeier <[email protected]> Authored: Thu Jan 10 18:22:54 2013 +0100 Committer: svenmeier <[email protected]> Committed: Thu Jan 10 18:22:54 2013 +0100 ---------------------------------------------------------------------- .../org/apache/wicket/model/ComponentModel.java | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/a92efff8/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java b/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java index b5e322f..44110d4 100644 --- a/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java +++ b/wicket-core/src/main/java/org/apache/wicket/model/ComponentModel.java @@ -46,7 +46,7 @@ public class ComponentModel<T> implements IModel<T>, IComponentAssignedModel<T> * @see org.apache.wicket.model.IModel#setObject(java.lang.Object) */ @Override - public final void setObject(Object object) + public final void setObject(T object) { throw new RuntimeException("set object call not expected on a IComponentAssignedModel"); } @@ -71,7 +71,7 @@ public class ComponentModel<T> implements IModel<T>, IComponentAssignedModel<T> * @param object * The object that will be set in the model. */ - protected void setObject(Component component, Object object) + protected void setObject(Component component, T object) { } @@ -128,7 +128,7 @@ public class ComponentModel<T> implements IModel<T>, IComponentAssignedModel<T> * @see org.apache.wicket.model.IModel#setObject(java.lang.Object) */ @Override - public void setObject(Object object) + public void setObject(T object) { ComponentModel.this.setObject(component, object); }
