You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2011/01/24 09:03:39 UTC

svn commit: r1062672 - in /wicket/trunk: wicket-core/src/main/java/org/apache/wicket/markup/html/link/ wicket-core/src/test/java/org/apache/wicket/markup/html/link/ wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/

Author: mgrigorov
Date: Mon Jan 24 08:03:39 2011
New Revision: 1062672

URL: http://svn.apache.org/viewvc?rev=1062672&view=rev
Log:
WICKET-3338 Please provide a LabelLink or something similar

Rename AbstractLink#setBodyModel() to #setBody().
Wrap the passed model.

suggested-by: ivaynberg, jrthomerson

Modified:
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
    wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
    wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java?rev=1062672&r1=1062671&r2=1062672&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/AbstractLink.java Mon Jan 24 08:03:39 2011
@@ -220,7 +220,7 @@ public abstract class AbstractLink exten
 	/**
 	 * @return the link's body model
 	 */
-	public IModel<?> getBodyModel()
+	public IModel<?> getBody()
 	{
 		return bodyModel;
 	}
@@ -231,9 +231,9 @@ public abstract class AbstractLink exten
 	 * @param bodyModel
 	 * @return <code>this</code> for method chaining
 	 */
-	public AbstractLink setBodyModel(final IModel<?> bodyModel)
+	public AbstractLink setBody(final IModel<?> bodyModel)
 	{
-		this.bodyModel = bodyModel;
+		this.bodyModel = wrap(bodyModel);
 		return this;
 	}
 }

Modified: wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java?rev=1062672&r1=1062671&r2=1062672&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java (original)
+++ wicket/trunk/wicket-core/src/main/java/org/apache/wicket/markup/html/link/ExternalLink.java Mon Jan 24 08:03:39 2011
@@ -55,7 +55,7 @@ public class ExternalLink extends Abstra
 		super(id);
 
 		setDefaultModel(href != null ? new Model<String>(href) : null);
-		setBodyModel(Model.of(label));
+		setBody(Model.of(label));
 	}
 
 	/**
@@ -99,7 +99,7 @@ public class ExternalLink extends Abstra
 		super(id);
 
 		setDefaultModel(wrap(href));
-		setBodyModel(wrap(label));
+		setBody(label);
 	}
 
 	/**
@@ -216,12 +216,12 @@ public class ExternalLink extends Abstra
 	}
 
 	/**
-	 * @deprecated use {@link #getBodyModel()} instead
+	 * @deprecated use {@link #getBody()} instead
 	 * @return the model used for the link's body
 	 */
 	@Deprecated
 	public IModel<?> getLabel()
 	{
-		return getBodyModel();
+		return getBody();
 	}
 }
\ No newline at end of file

Modified: wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java?rev=1062672&r1=1062671&r2=1062672&view=diff
==============================================================================
--- wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java (original)
+++ wicket/trunk/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java Mon Jan 24 08:03:39 2011
@@ -60,7 +60,7 @@ public class AbstractLinkTest
 			private static final long serialVersionUID = 1L;
 		};
 		link.setMarkupId("link");
-		link.setBodyModel(Model.of(linkBody));
+		link.setBody(Model.of(linkBody));
 		mockPageWithLink.add(link);
 
 		wicketTester.startPage(mockPageWithLink);

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java?rev=1062672&r1=1062671&r2=1062672&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/linkomatic/Home.java Mon Jan 24 08:03:39 2011
@@ -176,7 +176,7 @@ public class Home extends WicketExampleP
 			{
 			}
 		};
-		linkWithLabel.setBodyModel(Model.of("A link that provides its body with Link.setBodyLabel(someModel)"));
+		linkWithLabel.setBody(Model.of("A link that provides its body with Link.setBodyLabel(someModel)"));
 		add(linkWithLabel);
 	}