svn commit: r740335 - /wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java

[iv...@apache.org]

Author: ivaynberg
Date: Tue Feb  3 16:20:25 2009
New Revision: 740335

URL: http://svn.apache.org/viewvc?rev=740335&view=rev
Log:
cleanup

Modified:
    wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java

Modified: wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java?rev=740335&r1=740334&r2=740335&view=diff
==============================================================================
--- wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java (original)
+++ wicket/trunk/wicket-extensions/src/main/java/org/apache/wicket/extensions/breadcrumb/BreadCrumbBar.java Tue Feb  3 16:20:25 2009
@@ -58,6 +58,8 @@
 		 * 
 		 * @param id
 		 *            Component id
+		 * @param separatorMarkup
+		 *            markup used as a separator between breadcrumbs
 		 * @param index
 		 *            The index of the bread crumb
 		 * @param breadCrumbModel
@@ -67,12 +69,12 @@
 		 * @param enableLink
 		 *            Whether the link should be enabled
 		 */
-		public BreadCrumbComponent(String id, String separator, int index,
+		public BreadCrumbComponent(String id, String separatorMarkup, int index,
 			IBreadCrumbModel breadCrumbModel, final IBreadCrumbParticipant breadCrumbParticipant,
 			boolean enableLink)
 		{
 			super(id);
-			add(new Label("sep", (index > 0) ? separator : "").setEscapeModelStrings(false)
+			add(new Label("sep", (index > 0) ? separatorMarkup : "").setEscapeModelStrings(false)
 				.setRenderBodyOnly(true));
 			BreadCrumbLink link = new BreadCrumbLink("link", breadCrumbModel)
 			{
@@ -113,12 +115,12 @@
 		{
 			super(id);
 			setReuseItems(false);
-			setDefaultModel(new LoadableDetachableModel()
+			setDefaultModel(new LoadableDetachableModel<List<IBreadCrumbParticipant>>()
 			{
 				private static final long serialVersionUID = 1L;
 
 				@Override
-				protected Object load()
+				protected List<IBreadCrumbParticipant> load()
 				{
 					// save a copy
 					List<IBreadCrumbParticipant> l = new ArrayList<IBreadCrumbParticipant>(