You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by sv...@apache.org on 2014/06/04 18:07:28 UTC

git commit: make SelectOption an IGenericComponent

Repository: wicket
Updated Branches:
  refs/heads/wicket-6.x 8391dcf91 -> b38746264


make SelectOption an IGenericComponent

Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/b3874626
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/b3874626
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/b3874626

Branch: refs/heads/wicket-6.x
Commit: b38746264a2b0e2cbad43357ef559f1f519c637b
Parents: 8391dcf
Author: svenmeier <sv...@meiers.net>
Authored: Wed Jun 4 18:02:46 2014 +0200
Committer: svenmeier <sv...@meiers.net>
Committed: Wed Jun 4 18:02:46 2014 +0200

----------------------------------------------------------------------
 .../markup/html/form/select/SelectOption.java   | 29 +++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/wicket/blob/b3874626/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
index 73eb4cc..2320222 100644
--- a/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
+++ b/wicket-extensions/src/main/java/org/apache/wicket/extensions/markup/html/form/select/SelectOption.java
@@ -17,6 +17,7 @@
 package org.apache.wicket.extensions.markup.html.form.select;
 
 import org.apache.wicket.Component;
+import org.apache.wicket.IGenericComponent;
 import org.apache.wicket.WicketRuntimeException;
 import org.apache.wicket.markup.ComponentTag;
 import org.apache.wicket.markup.html.WebMarkupContainer;
@@ -30,7 +31,7 @@ import org.apache.wicket.model.IModel;
  * 
  * @author Igor Vaynberg
  */
-public class SelectOption<T> extends WebMarkupContainer
+public class SelectOption<T> extends WebMarkupContainer implements IGenericComponent<T>
 {
 	private static final long serialVersionUID = 1L;
 
@@ -58,6 +59,32 @@ public class SelectOption<T> extends WebMarkupContainer
 		super(id, model);
 	}
 
+	@Override
+	@SuppressWarnings("unchecked")
+	public final IModel<T> getModel()
+	{
+		return (IModel<T>)getDefaultModel();
+	}
+
+	@Override
+	public final void setModel(IModel<T> model)
+	{
+		setDefaultModel(model);
+	}
+
+	@SuppressWarnings("unchecked")
+	@Override
+	public final T getModelObject()
+	{
+		return (T)getDefaultModelObject();
+	}
+
+	@Override
+	public void setModelObject(T object)
+	{
+		setDefaultModelObject(object);
+	}
+
 	/**
 	 * Form submission value used for this select option. This string will appear as the value of
 	 * the <code>value</code> html attribute for the <code>option</code> tag.