You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by iv...@apache.org on 2008/06/21 04:28:06 UTC
svn commit: r670120 - in /wicket/sandbox/ivaynberg/generics:
wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/
wicket/src/main/java/org/apache/wicket/ajax/markup/html/
wicket/src/main/java/org/apache/wicket/markup/html/link/
Author: ivaynberg
Date: Fri Jun 20 19:28:06 2008
New Revision: 670120
URL: http://svn.apache.org/viewvc?rev=670120&view=rev
Log:
generify link
Modified:
wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
Modified: wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java?rev=670120&r1=670119&r2=670120&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/IndicatingAjaxLink.java Fri Jun 20 19:28:06 2008
@@ -29,7 +29,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public abstract class IndicatingAjaxLink extends AjaxLink implements IAjaxIndicatorAware
+public abstract class IndicatingAjaxLink<T> extends AjaxLink<T> implements IAjaxIndicatorAware
{
private static final long serialVersionUID = 1L;
private final WicketAjaxIndicatorAppender indicatorAppender = new WicketAjaxIndicatorAppender();
@@ -50,7 +50,7 @@
* @param id
* @param model
*/
- public IndicatingAjaxLink(String id, IModel<?> model)
+ public IndicatingAjaxLink(String id, IModel<T> model)
{
super(id, model);
add(indicatorAppender);
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java?rev=670120&r1=670119&r2=670120&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/ajax/markup/html/AjaxLink.java Fri Jun 20 19:28:06 2008
@@ -32,7 +32,7 @@
* @author Igor Vaynberg (ivaynberg)
*
*/
-public abstract class AjaxLink extends AbstractLink implements IAjaxLink
+public abstract class AjaxLink<T> extends AbstractLink implements IAjaxLink
{
private static final long serialVersionUID = 1L;
@@ -52,7 +52,7 @@
* @param id
* @param model
*/
- public AjaxLink(final String id, final IModel<?> model)
+ public AjaxLink(final String id, final IModel<T> model)
{
super(id, model);
@@ -121,4 +121,47 @@
* @param target
*/
public abstract void onClick(final AjaxRequestTarget target);
+
+ /**
+ * Gets model
+ *
+ * @return model
+ */
+ @SuppressWarnings("unchecked")
+ public final IModel<T> getModel()
+ {
+ return (IModel<T>)getDefaultModel();
+ }
+
+ /**
+ * Sets model
+ *
+ * @param model
+ */
+ public final void setModel(IModel<T> model)
+ {
+ setDefaultModel(model);
+ }
+
+ /**
+ * Gets model object
+ *
+ * @return model object
+ */
+ @SuppressWarnings("unchecked")
+ public final T getModelObject()
+ {
+ return (T)getDefaultModelObject();
+ }
+
+ /**
+ * Sets model object
+ *
+ * @param object
+ */
+ public final void setModelObject(T object)
+ {
+ setDefaultModelObject(object);
+ }
+
}
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java?rev=670120&r1=670119&r2=670120&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/DownloadLink.java Fri Jun 20 19:28:06 2008
@@ -38,7 +38,7 @@
*
* @author Igor Vaynberg (ivaynberg)
*/
-public class DownloadLink extends Link
+public class DownloadLink extends Link<File>
{
/**
*
@@ -134,7 +134,7 @@
@Override
public void onClick()
{
- final File file = (File)getDefaultModelObject();
+ final File file = getModelObject();
if (file == null)
{
throw new IllegalStateException(getClass().getName() +
Modified: wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java
URL: http://svn.apache.org/viewvc/wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java?rev=670120&r1=670119&r2=670120&view=diff
==============================================================================
--- wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java (original)
+++ wicket/sandbox/ivaynberg/generics/wicket/src/main/java/org/apache/wicket/markup/html/link/Link.java Fri Jun 20 19:28:06 2008
@@ -73,7 +73,7 @@
* @author Jonathan Locke
* @author Eelco Hillenius
*/
-public abstract class Link extends AbstractLink implements ILinkListener
+public abstract class Link<T> extends AbstractLink implements ILinkListener
{
/** Change record for when an anchor is changed. */
private final class AnchorChange extends Change
@@ -133,7 +133,7 @@
/**
* @see org.apache.wicket.Component#Component(String, IModel)
*/
- public Link(final String id, IModel<?> object)
+ public Link(final String id, IModel<T> object)
{
super(id, object);
}
@@ -472,4 +472,47 @@
}
}
+
+ /**
+ * Gets model
+ *
+ * @return model
+ */
+ @SuppressWarnings("unchecked")
+ public final IModel<T> getModel()
+ {
+ return (IModel<T>)getDefaultModel();
+ }
+
+ /**
+ * Sets model
+ *
+ * @param model
+ */
+ public final void setModel(IModel<T> model)
+ {
+ setDefaultModel(model);
+ }
+
+ /**
+ * Gets model object
+ *
+ * @return model object
+ */
+ @SuppressWarnings("unchecked")
+ public final T getModelObject()
+ {
+ return (T)getDefaultModelObject();
+ }
+
+ /**
+ * Sets model object
+ *
+ * @param object
+ */
+ public final void setModelObject(T object)
+ {
+ setDefaultModelObject(object);
+ }
+
}