svn commit: r1026590 - /wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java

[mg...@apache.org]

Author: mgrigorov
Date: Sat Oct 23 09:43:58 2010
New Revision: 1026590

URL: http://svn.apache.org/viewvc?rev=1026590&view=rev
Log:
Add documentation and exception messages

Modified:
    wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java

Modified: wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java
URL: http://svn.apache.org/viewvc/wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java?rev=1026590&r1=1026589&r2=1026590&view=diff
==============================================================================
--- wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java (original)
+++ wicket/trunk/wicket-request/src/main/java/org/apache/wicket/request/mapper/mount/MountMapper.java Sat Oct 23 09:43:58 2010
@@ -22,6 +22,7 @@ import org.apache.wicket.request.Request
 import org.apache.wicket.request.Url;
 import org.apache.wicket.request.mapper.AbstractMapper;
 import org.apache.wicket.util.lang.Args;
+import org.apache.wicket.util.lang.Checks;
 import org.apache.wicket.util.string.StringValue;
 
 /**
@@ -97,7 +98,9 @@ public class MountMapper extends Abstrac
 	/**
 	 * 
 	 * @param request
-	 * @return
+	 *            a {@link Request} with the all mount segments - mount ones and the ones for the
+	 *            delegated mapper
+	 * @return a {@link Request} with {@link Url} without the mount segments
 	 */
 	private Request dismountRequest(Request request)
 	{
@@ -142,9 +145,8 @@ public class MountMapper extends Abstrac
 			return null;
 		}
 
-		// TODO
-		// Check.notNull(mount.getUrl());
-		// Check.notNull(mount.getMountParameters());
+		Checks.notNull(mount.getUrl(), "Mount's Url should not be null");
+		Checks.notNull(mount.getMountParameters(), "Mount's parameters should not be null");
 
 		for (int i = mountSegments.length; i > 0; i--)
 		{
@@ -157,7 +159,8 @@ public class MountMapper extends Abstrac
 				replacement = mount.getMountParameters().getValue(placeholder).toString();
 				if (replacement == null)
 				{
-					throw new IllegalStateException();// TODO message
+					throw new IllegalStateException(String.format(
+						"Cannot find a value for placeholder '%s'.", placeholder));
 				}
 			}