svn commit: r1024297 - /wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java

[mg...@apache.org]

Author: mgrigorov
Date: Tue Oct 19 15:58:20 2010
New Revision: 1024297

URL: http://svn.apache.org/viewvc?rev=1024297&view=rev
Log:
WICKET-3115 source code link doesn't work in wicket-examples 1.5 - request mappers demo

Use CustomHomeMapper only if the requestHandler is serving Application#getHomePage()
Otherwise the links' URLs are not properly calculated

Modified:
    wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java

Modified: wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java?rev=1024297&r1=1024296&r2=1024297&view=diff
==============================================================================
--- wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java (original)
+++ wicket/trunk/wicket-examples/src/main/java/org/apache/wicket/examples/requestmapper/CustomHomeMapper.java Tue Oct 19 15:58:20 2010
@@ -18,6 +18,7 @@ package org.apache.wicket.examples.reque
 
 import java.util.List;
 
+import org.apache.wicket.Application;
 import org.apache.wicket.Session;
 import org.apache.wicket.request.IRequestHandler;
 import org.apache.wicket.request.IRequestMapper;
@@ -55,9 +56,20 @@ public class CustomHomeMapper extends Ab
 	 */
 	public Url mapHandler(IRequestHandler requestHandler)
 	{
-		String locale = Session.get().getLocale().toString();
-		Url homeUrl = new Url();
-		homeUrl.getSegments().add(0, locale);
+		Url homeUrl = null;
+
+		if (requestHandler instanceof RenderPageRequestHandler)
+		{
+			RenderPageRequestHandler pageRequestHandler = (RenderPageRequestHandler)requestHandler;
+
+			if (pageRequestHandler.getPageClass().equals(Application.get().getHomePage()))
+			{
+				String locale = Session.get().getLocale().toString();
+				homeUrl = new Url();
+				homeUrl.getSegments().add(0, locale);
+			}
+		}
+
 		return homeUrl;
 	}